[cvsnt] Re: Merging branches with mergepoints
tony.hoyle at march-hare.com
Sat Dec 3 04:06:51 GMT 2005
Detlef Marschall wrote:
> There's a problem. The user must know that this is the first merge to B2
> for the specific source. Then he must use "-jTAG -jBRANCH" for the
> merge, otherwise he can merge with "-jBRANCH". For only a few sources is
> this OK. But there are 2816 sources, without includes, and nobody can
> say how many he must change for a problem. Only when all sources was
> merged from B1 to B2 then we can use mergepoints with no problem.
The problem is created by the fact that B2 has the wrong base.
If you're promoting HEAD->B1->B2 then B2 should be based on B1 (or
possibly the same revision of HEAD). By creating B2 out of a different
revision there is no possible way of retionalising it without an
You've got the situation:
1.3 -> B1 + changes (eg. 126.96.36.199)
1.8 -> B2 + changes (eg 188.8.131.52)
The 'common ancestor' of both branches is 1.3, so the only possible (and
logical) merge of B1->B2 is the entireity of B1 onto B2. Once a
mergepoint is there it fixes this as it knows where the first merge was.
The only revisions being considered during such a merge are 1.3->184.108.40.206
(common ancestor to branch head) being patched onto revision 220.127.116.11
(current sandbox revision). There are no mergepoints within that frame
of reference. Once a mergepoint is registered at 18.104.22.168, any future
merges will use that as their starting point.
More information about the cvsnt