[cvsnt] Re: Branch merging - this seems wrong...

Tony Hoyle tony.hoyle at march-hare.com
Wed Jun 7 11:23:54 BST 2006


Tony Eva wrote:
> No - the changes in B1 are not lost.  B2 is not just a copy of A3, it is
> a merged sum of B1 and A3.

No it isn't.  B2 is simply the changes required to go from B1 to the merged 
B1+A3.  Similarly B3 does not contain B2.

It does not contain B1.  No revision ever contains a copy of its ancestors - 
that would be a nightmare to manage (and very large).

You declare it to be equivalent to A3 in the mergepoint, but if you just take 
that in the other direction you get a merge that does not contain B1.

Tony



More information about the cvsnt mailing list