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

[Tony Hoyle]

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.

Tony