[cvsnt] Re: Branch merging - this seems wrong...

Tony Hoyle tony.hoyle at march-hare.com
Mon Jun 5 19:21:57 BST 2006

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.

Prochazka, Jan wrote:
> Well, let say the file of the HEAD has changed so merge from HEAD to the
> branch changes the file. Ok we have another revision in the branch.
> However after merge from the branch to the HEAD the file is committed
> even if no other changes were done in the branch or in the HEAD since
> the merge.
> Couldn't commit avoid files with zero diffs ?

We do for the most part (null deltas for single merges are ignored)..  however 
there are scenarios where a new version must be stored no matter what.  Such 
revisions take up very little space so aren't an issue.


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