From: H. Peter Anvin <hpa@zytor.com>
Date: Tue, 06 Sep 2005 23:19:32 GMT
Subject: Re: [PATCH] git-cvsimport-script: handling of tags
Message-ID: <431E2404.6060804@zytor.com>
In-Reply-To: <46a038f9050906155962d33869@mail.gmail.com>

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 detection based on your tagnames.
> 

No, there are three tags:

             before-merge-foo
             |  after-merge-foo
             |  |
branch 1 ---*--*----
               /
              /
branch 2 ---*-------
             |
             merge-point-foo

That's why I was a bit confused.  I thought most people did something 
similar.

	-hpa