[cvsnt] Mergepoint killer?

Glen Starrett grstarrett at cox.net
Tue Jan 13 15:11:58 GMT 2004


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.


> Mergepoints only work if you do the sequence:
> 
> 1. Merge (update -j)
> 2. Modify
> 3. Commit
> 
> If you do anything else like update again then the mergepoint is lost
> on the files that are updated as they are no longer the result of the
> merge.  Luckily this sequence is the most common when merging trees.

OK, thanks.  That's the procedure I had documented for him to use... But he
didn't.  *sigh*  What a mess!

Glen Starrett





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