[cvsnt] Re: Possible bug with mergepoints

John Hall john-news2 at cambridgetechgroup.com
Wed Feb 23 13:48:45 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.


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 





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