Re: cvs2git "merge based on commit messages"

Thanks for answering.

> > One feature I miss in cvs2git comparing to "git cvsimport" is the
> > approximative creation of merge-links between branches based on
> > commit messages (like "merged from RELEASE_1_2").
> 
> I'm not familiar with that feature, but it sounds like fun.  How does it
> work in "git cvsimport"?

It is fun, as it is a very rough heuristic, but seemed to work quite good. Although I would not rely on it, at least it gave some relevant linking information about the branches. 

I don't know the internals. Probably, it's just using "the most recent revision from the source branch as the second merge parent".

http://www.kernel.org/pub/software/scm/git/docs/git-cvsimport.html

<quote>
-m

    Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the source branch name from the commit message.
-M <regex>

    Attempt to detect merges based on the commit message with a custom regex. It can be used with -m to enable the default regexes as well. You must escape forward slashes.

    The regex must capture the source branch name in $1.

    This option can be used several times to provide several detection regexes.
</quote>

> Another, git-specific possibility would be to do the whole thing
> post-conversion using git tools.  One would only have to create a git
> "grafts" file listing each merge commit with its two parent SHA1s, then
> use "git filter-branch" to make the grafts permanent.  All this should
> be done, of course, before publishing the git repository.

This sounds most appealing:
 * although I like cvs2git, I must admit that I think it is more relevant to dive into git details than into cvs2git-implementation
 * I did take a look around in git_output_option.py. It did not seem to simple to fix for me.
 * I would not have to deal with all the details of add/removing files/directories.
 * With git-move-refs.py I have a starting point.

I don't know, if I will get to something some day. If I do, I would post it to this list. 

Regards,
  Tobias

By the way, you could mention in git-move-refs.py that it supersedes git-move-tags.py and git-move-refs.py, because it took me some time to find this out. git-move-tags.py could be removed from contrib/ right?
-- 
GRATIS! Movie-FLAT mit über 300 Videos. 
Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2680723

To unsubscribe from this discussion, e-mail: [[email protected]].