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.
On Mon, 5 Jun 2006 14:18:18 -0400, "Prochazka, Jan" <Jan.Prochazka at brooks.com> wrote: >> But they *have* changed - you've inserted the changes from >> the trunk. That >> must be recorded, otherwise cvsnt wouldn't be doing its job. > >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 ? > There *is* a difference. The fact that there was a merge between branches creates a mergepoint value that has to be stored. So the file *contents* is the same but the RCS file is not... HTH /Bo (Bo Berglund, developer in Sweden)