[cvsnt] Mergepoint issues on 2.5.0.3 b2382

[Tony Hoyle]

Andreas Krey wrote:

> This is not what the patch does, obviously. It chooses the diff from
> 1.2 to 1.1.2.3 to be merged into the head. You need to used the base
> of the last merge arrow as the base version for the merge, not the tip.

But 1.2 is *not* an ancestor of 1.1.2.3, so the merge is bogus.

All you've done is degraded merge into a simple copy.  In a true merging 
situation the two branches can easily follow independent paths and never 
be identical to each other - mergepoints are designed to help you 
extract the difference between two points on the *same* branch.  What 
you seem to want is not mergepoints but a copy operation.

Tony