[cvsnt] Merging branch with identical versions still changes

Tony Hoyle tmh at nodomain.org
Thu Nov 6 22:42:31 GMT 2003

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.

Glen Starrett wrote:

> Just in case anyone else needs to know, I discovered I can work around
> this a little by doing:
> cvs -q diff | find "RCS file:"
> to get a list of all the files that have changed.  That at least gets me a
> list of files that were actually changed on the branch.
> Oh, and I forgot to mention: I'm using cvs 2.0.11 server and a combination
> of 2.0.11 (at command line) and 2.0.8 (via TortoiseCVS 1.5.1) on the
> client. I ran a quick check using 2.0.11 exclusively on the final merging
> step and got the same results.

Storing a mergepoint takes a revision.  There is a patch in the 2.1 branch
that avoids it where there's no changes (IIRC it skips the mergepoint where
there's nothing to merge) but it's not well tested (plus I'm getting less
and less time to work on cvsnt these days.. I can't even get time look at
bugs in the release branch at the moment).


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