[cvsnt] Mergepoint issues on 126.96.36.199 b2382
tony.hoyle at march-hare.local
Fri Jan 12 16:10:22 GMT 2007
Richard Wirth wrote:
> No that's not the way the code works!
> The patched Version (bidirectional mergepoints) will do
> so there is no data lost (at least in this very simple example) but
> avoidable conflicts are ommited.
That's wrong - 1.2 is not the common ancestor. What that creates is
essentially a copy of the branch onto HEAD not a merge.
More information about the cvsnt