[cvsnt] Re: Possible bug with mergepoints

[Tony Hoyle]

John Hall wrote:
> It can matter, because next time you merge, you're quite likely to get 
> conflicts.

Since there's only one revision, mergepoint == branchpoint, so you're 
not getting any conflicts that aren't there already.

> It's also inconsistent, because it only happens to added files and not any 
> other modified files.

It'll happen to anything that the server modifies - update after merge 
isn't guaranteed to keep mergepoints in any situation.

Tony