[cvsnt] Re: Possible bug with mergepoints

Tony Hoyle tmh at nodomain.org
Wed Feb 23 13:56:01 GMT 2005


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


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



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook