[cvsnt] Re: Possible bug with mergepoints

[John Hall]

Tony Hoyle" <tmh at nodomain.org> wrote in message 
news:cvhq12$hi5$1 at paris.nodomain.org...
> John Hall wrote:

>> Doing the second 'cvs up' seems to have the effect of clearing the 
>> mergepoint field for that file, and it is not recorded on the server. If 
>> the
>
> That's expected...  mergepoints are only really valid until the next 
> update.  For something like an add it doesn't matter anyway as there's 
> only one revision.

It can matter, because next time you merge, you're quite likely to get 
conflicts.
It's also inconsistent, because it only happens to added files and not any 
other modified files.

Regards,
John