Hi people,
I wrote a script (svn-merge2git [1]) that helps to convert SVN merges
to Git merges. The script basically detects the merges from their
commit message and re-create them properly on the Git side. It took
me several iterations to get it right but it eventually successfully
converted a SVN repo with ~2500 revisions in a dozen of branches with
~100 merges in between them. The script can be used when one wants
to entirely convert a SVN repo to a Git one while preserving the
merges (that is, showing the merges in the Git history). I guess it
can also be used to inject merges in the history of a git-svn repo to
facilitate merging of SVN branches with Git, although I haven't had
time to experiment this for now.
I hope this will be helpful to others.
[1] Code and explanations at: http://repo.or.cz/w/svn-merge2git.git
--
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
