[cvsnt] Re: Merging branches with mergepoints

[Tony Hoyle]

Detlef Marschall wrote:
> Hi,
> 
> first, sorry for my bad english.
> 
> We have the following problem.
> 
> A branch is split from the HEAD --> B1. We made changes in that branch and
> merging them to the HEAD "cvs up -jB1". For every merge we become a
> mergepoint in the HEAD, that's ok.
> 
> Later we split another branch from HEAD --> B2. All mergepoints from branch
> B1 are lost in branch B2. In my opinion is this a bug. When we merge from
> branch B1 to branch B2 cvs will merge all changes from the start of B1 until
> the last revision in the Branch B1 instead only the last changes.

This is as designed.  B1 is unrelated to B2, except they both come from 
HEAD at some point in the history.

After the first merge you will have a mergepoint and it'll work normally.

Tony