Hi list,
I'm in the processing of converting the SVN repos of my company to
Git. We have been using scripts to handle the merge hell with SVN
and these scripts always mentioned what was merged where in the
commit message. The first line is typically: merge -r FROM:TO
https://svn.fake-company.com/svn/project/{trunk,branches/branch-name}
I'm going to import the repositories with `git-svn' and then I'd like
to rewrite the entire history to take these merges in account in the
Git repo, if possible. This will probably help us merging the
(former) SVN branches in our new Git repo. I know I can simulate a
merge with a graft and I think it will be fairly easy to write a
small script that parses the log and generates the corresponding
graft file. Now the question is: how to make these grafts part of
the *real* history so that we don't have to depend on the graft file
anymore?
I know this issue has already been raised on the ML (the "how to
include grafts are real merges in the history" thing) but I couldn't
find the corresponding posts and can't remember the conclusion...
Thanks!
--
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
