[PATCH] git-cvsimport-script: handling of tags

2005-09-06 Thread H. Peter Anvin
This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Pullable tree at

Re: [PATCH] git-cvsimport-script: handling of tags

2005-09-06 Thread H. Peter Anvin
H. Peter Anvin wrote: This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Pullable tree at

Re: [PATCH] git-cvsimport-script: handling of tags

2005-09-06 Thread Junio C Hamano
H. Peter Anvin [EMAIL PROTECTED] writes: This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Looks good.

Re: [PATCH] git-cvsimport-script: handling of tags

2005-09-06 Thread H. Peter Anvin
H. Peter Anvin wrote: H. Peter Anvin wrote: This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Pullable tree

Re: [PATCH] git-cvsimport-script: handling of tags

2005-09-06 Thread Martin Langhoff
On 9/7/05, H. Peter Anvin [EMAIL PROTECTED] wrote: Martin Langhoff wrote: Tell me more about how you are trying the 'recognize merge'. It is a pretty unsophisticated thing, as it trusts the commit message in the first place. But when it works, it works. Perhaps it would be good to

Re: [PATCH] git-cvsimport-script: handling of tags

2005-09-06 Thread H. Peter Anvin
Martin Langhoff wrote: My style has always be to use tags for merges; tag the origin branch as well as before and after on the receiving branch. Do you move the tags with cvs tag -F? If that's the case, the data you need to merge is lost... otherwise, you could hack an alternative merge

Re: [PATCH] git-cvsimport-script: handling of tags

2005-09-06 Thread Martin Langhoff
On 9/7/05, H. Peter Anvin [EMAIL PROTECTED] wrote: This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) looks good.

Re: [PATCH] git-cvsimport-script: handling of tags

2005-09-06 Thread H. Peter Anvin
Martin Langhoff wrote: On 9/7/05, H. Peter Anvin [EMAIL PROTECTED] wrote: This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches