[cvsnt] Merging branch with identical versions still changes

John Peacock jpeacock at rowman.com
Thu Nov 6 23:20:40 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:

> This is about process rather than capability--I have the developers on my
> team responsible to update their sandbox with code from MAIN just before
> submitting to me for final review and integration with the MAIN line, thus
> the extra hop.  It puts the ball in their lap to get everything working with
> MAIN line revisions before I inspect it.

It still doesn't require them to merge from trunk to branch prior to merging
back from branch to trunk.  They perform the merge from branch to a sandbox they
have moved to trunk.  Until that works 100%, they have to fix it on their
branch.  Once they are satisfied, then _you_ merge from their branch to trunk
and then _you_ can commit to trunk.  Same diff, but without any spurious commits
to the repository.

And as Tony has now confirmed, creating a mergepoint requires a commit, so this 
would explain why you are seeing empty changesets.  I still think that if your 
process is adjusted to eliminate the additional commits, you won't lose any control.


John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748

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