Enchanter Space Studio: git

Showing posts with label git. Show all posts

Wednesday, May 7, 2014

How to sync forked repos

Assume you are working on a forked repo and want to keep it synced with original one where you forked. But it is not limited to forked repos, it should be any two repos you want to merge together (Of cause you have to solve the conflict by yourself with your way).

Create a mirror repo for sync

git clone --mirror [local_repo_name]
git remote add --mirror=fetch upstream

Sync

git fetch --all -v --progress
git push --mirror -v --progress origin

Auto Sync

You can add it to "cron" if you want it to be synced automatically. Not good at it. Maybe some would like to help me work out the syntax for it.

Job done. Hope simple python script would come soon.

Wednesday, April 16, 2014

Good BitBucket Python API and CLI Packages

Since start using GIT as version control system, I use put all my
repos on BitBucket. I love the unlimited private repos from them. But
no command line tools for it is really painful for Linux users. Then I
start looking for good Python API for it to write simple script to
create/clone/list repos. But my Python knowledge make it a hard task
for me to do a good script.

Today just before I try to add "Description" to create repo, I found
the API "python-bitbucket-api" with Python script already. Try it out,
it is really good. Just some small issues like install and argument
parsing. Now everything works fine for me. Hope new features will
coming from original author(s).

If anyone is using BitBucket and looking for a command line tool for
it, you can give it a try: hg clone https://enchanter@bitbucket.org/enchanter/python-bitbucket-api

Wednesday, November 30, 2011

How to create tag/branch with git-svn

The SVN server structure is like this:

http://foo.net/code/design/
                          |-- trunk/
                          |        |-- proj1
                          |        |-- proj2
                          |-- tags/
                          |       |-- forProj1
                          |       |-- forProj2
                          |-- branches/
                          |           |-- forProj1

To create the tag:

Clone SVN:
$ git svn clone http://foo.net/code/design --trunk=trunk/proj1 --tags=tags/forProj1 --branches=branches/forProj1 localProjName
Then the tag can be created with simple command
$ git svn tag -n -m "test tag" test_v1

Do the branch in the same way.

The original question and answer can check http://stackoverflow.com/questions/8306592/git-svn-how-to-create-a-tag-branch-for-a-sub-project-of-svn

Wednesday, October 26, 2011

Git Resources

Source code / binaries / GUI

Git for Emacs

MaGit

Setting up Git server

Install Git from source

Diff/merge tools

Git through proxies

Git prompt

Documentation - git related sites

Documentation - books / guides / tutorials

Git Community Book / repository
Pro Git book / website / repository / examples
Git Magic
Git from the bottom up
An Illustrated Guide to Git on Windows
Git for Computer Scientists
Git for the lazy
Understanding Git Conceptually
Git_Guide
Git for beginners: The definitive practical guide
The Git Parable new
Easy Version Control with Git new
Git In Five Minutes new
jeff garzik’ guide to git new
Using Git Efficiently new
Git The Basics Tutorial new
A Git Workflow for Agile Teams new
Version control with Git - Tutorial new
Version Control for Designers new
Git for Subversion users, Part 1: Getting started new
Git for Subversion users, Part 2: Taking control new
A Visual Git Reference new
Git with Eclipse (EGit) - Tutorial new
Diving into Git new
Git Immersion
Git Guys Topics

Documentation - cheat sheets

Documentation - misc

Git Wiki / Git Faq / Blog posts on Git (usage) new
Git website documentation
GIT at DevHeaven
GitCasts
Setting up a new Rails app with Git
Using Git to manage a web site
Using Git to Maintain Your Website
git-notes repo
Why Git is Better than X
A Gaggle Of Git Tips
GIT: Using the stash
Slimming Down a Git Repository new
Creating a git branch without ancestry new
git merge vs git rebase: avoiding rebase hell new
Efficiently Updating Web Sites on Web Clusters new
Windows Git Tutorial: Cygwin, SSH and Projectlocker new
Git Tips new
Fix git “Not currently on any branch” Problem new
Git For Windows Developers - Git Series - Part 1
Some git best practices new
GIT Tips and Tools new
25 Tips for Intermediate Git Users new
Git quickstart new
The Thing About Git new
Git guts: Merging and rebasing new
My Git Workflow new
Bisecting History new
Using Git as a Backup Tool new
How to merge some (not all) files from one Git branch to another new
How to “Merge” Specific Files from Another Branch new
Git Utilities You Can’t Live Without new
The Unsightliness of Merge Commits new
A successful Git branching model new
Deploying A Web Application with Git and FTP new
Git Environment on Windows new
In praise of git’s index new
Some tips on using git with Windows new

Github tutorials

Monday, October 24, 2011

[GIT Submodule] Fatal: Reference is not a tree : xxxx

These days, try to use submodule to manage a project. But I got



$ git submodule update
fatal: reference is not a tree: ba81b5bf9ffce6b6ec9c50605035ca9dddb50023
Unable to checkout 'ba81b5bf9ffce6b6ec9c50605035ca9dddb50023' in submodule path 'Src/ThermalController'

The cause of this issue is:

I create the orignal project and add the submodule from remote repo.

Then modified the .gitmodule manual to point a local cache of the remote repo.

Then commit the original project.

I cloned the original project from repo as cloned project.

Here is the working flow:

Update from original project and commit, actually, that is committed to the remote repo.

In cloned project, pull and update the submodule, then I got the error message as above.

That because the local repo is not synced with remote yet.

So the solution is:

1. Try to sync the local/remote repo OR

2. Update the orignal project's submodule to point to the local repo as well as cloned project.

Thursday, October 20, 2011

Migrating a Subversion Project to Git on BitBucket (From Neogregious)

Subversion is still the gold standard for version control (a.k.a. source control) systems, but the new kid on the block - Git - has undeniable advantages for many development models. Even for solo or centralised hierarchical development organisations, Git's agile branching and merging make it a joy to use.

But if you're going to go to the effort of switching version control systems, you probably also want to consider moving your repository to the cloud. This increases your options for off-site developers, and reduces the risks and maintenance costs of internally managed version control servers.

This article describes how to migrate a Subversion repository to Bitbucket, one of several online repositories.
First of all, why Bitbucket? GitHub and Google Code are worthy alternatives, but both have restrictions that make them less desirable for private repositories. Google Code doesn't allow them at all, and GitHub currently charges a small but significant amount per private repository. Bitbucket charges by developer instead, with the first five being free. Another important consideration is that all three are backed by large commercial companies that are unlikely to blink out of existence overnight.

1. Preparation
OK, enough of the justifications, lets get migrating! In the Subversion world, the convention is that you structure your projects as follows:

foobar
   - Trunk
   - Branches
      - Europe
      - US
   - Tags
      - Version 3.11
      - Version 3.12

If you use different conventions (like "trunk" instead of "Trunk"), take extra care to translate these in the code below. Our example Subversion project URL is svn://myserver/myrepo/foobar so you will need to translate this too.

Next, we need to fix a small discontinuity in user handling between Subversion and Git. Subversion users are simple usernames (like gregf), whereas Git requires a user's name and their email address. Create a file calledauthors.txt containing an entry for each of your subversion users (usually listed in svn/myrepo/conf/passwd):

lisas = Lisa Simpson 
barts = Bart Simpson

Finally. make sure you have git and git-svn installed. Google to find out how to do this on your operating system.

2. Convert the Subversion Project to a Local Git Repository
At the command line, enter:

git svn clone svn://myserver/myrepo/foobar --no-metadata -A authors.txt -b Branches -T Trunk -t Tags foobar_local

Make yourself some tea, coffee or martini - this will take a wee while, as it works through the entire history of changes in the Subversion project. Assuming all goes well, you should end up with a directory calledfoobar_local containing both your project, and more importantly a hidden directory called .git. To check, change into the directory and view the log:

cd foobar_local
git log
git branch

That last command doesn't show your branches! Don't panic, this will come right later.

3. Convert Ignore Filemasks
If you have set up filemasks for Subversion to ignore, we can easily convert these into the Git equivalent:

cd foobar_local
git svn show-ignore -i trunk > .gitignore
git add .gitignore
git commit -m 'Convert svn:ignore properties to .gitignore.'

Note that Trunk in Subversion has been lower-cased by Git to trunk.

4. Create a Bare Git Repository
So far you have a local git repository, but you need a bare repository to clone from. As part of this process, we set Git's symbolic HEAD to what was Subversion's (lower-cased) trunk, tell Git about any branches, and renametrunk to master (the convention in Git).

cd ..
git init --bare foobar_bare
cd foobar_bare
git symbolic-ref HEAD refs/heads/trunk
cd ../foobar_local
git remote add bare ../foobar_bare
git config remote.bare.push 'refs/remotes/*:refs/heads/*'
git push bare
cd ../foobar_bare
git branch -m trunk master

After the push, Git will list the new branches. I told you not to panic!

5. Convert Tags
Actually, if you use tags you might still be worried that all your tags seem to be branches. Git handles tags very differently from Subversion - in Git tags are simply aliases to a particular commit, whilst Subversion treats tags as a dead-end branch. Git-svn simply renames these branches, so we still need to convert these branch-tags to real Git tags:

cd foobar_bare
git for-each-ref --format='%(refname)' refs/heads/tags |
cut -d / -f 4 |
while read ref
do
   git tag "$ref" "refs/heads/tags/$ref";
   git branch -D "tags/$ref";
done

6. Push the Bare Repository to Bitbucket
Don't worry, we're nearly there now. The last step is to push all the branches up to Bitbucket. Log in to Bitbucket, and create a new repository calledfoobar. It will then show you the command required to clone this repository, which will include the HTTPS URL. The command will be something like this:

$ git clone https://myname@bitbucket.org/myname/foobar.git

The URL is the yellow section above. Now on your local machine, set the orgin and push the master (old trunk) and each branch to Bitbucket:

git remote add origin https://myname@bitbucket.org/myname/foobar.git
git push origin master
git push origin europe
git push origin us

Your project is now on Bitbucket.

7. Tidy Up
The only thing left now is to tidy up the local and bare repositories left on your machine.

cd ..
rm -rf foobar_local
rm -rf foobar_bare

And... you're done. Time for another tea, coffee, or martini to celebrate your success!

Original Post: http://neogregious.blogspot.com/2011/10/migrating-subversion-project-to-git-on.html

Enchanter Space Studio