[Vm-dev] Gitorious: Imported SVN histrory

Igor Stasenko siguctua at gmail.com
Thu Jan 20 13:10:57 UTC 2011


i imported the SVN commit history into git repositories.. which was
quite simple to do... Too bad i didn't knew how to do that from
starting :)
so, now that required to drop an existing 'master' branches.
Anyways there was not much, so it is better to do that... because now
git repos having full commit history imported from svn.


okay, now those who did cloned repos should rebase their work on new branch..

It can be done like following:

git remote add blessed git at gitorious.org:cogvm/blessed.git
git branch blessed   "create a new local branch - blessed (or pick any
other name)"
git checkout blessed  "switch to this branch"

rm -rf *
git commit -a

git checkout master
git rebase --onto blessed c0e8e46d34a197e5dfb9c29a100f70c0bbeb7e69 master

where 'c0e8e46d34a197e5dfb9c29a100f70c0bbeb7e69' is my first commit,
i'd like to replay against SVN repository.

after fixing any merge conflicts, issue
git rebase --continue

until you done.

git push

(see http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html)

and of course, you can always pull from blessed and merge your changes
manually to avoid complications :)

Best regards,
Igor Stasenko AKA sig.

More information about the Vm-dev mailing list