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: >>It's recording a real change - that the branch has been merged. > > > Unfortuantely cvs does also merge if the file was not changed and the problem does occur even with one branch and merging back and forth. It merges if the revision is different between the branch and the mainline, which is true in the case you're describing. This is a real change - you have to describe a merge. If you merge multiple branches you will get this, since each merge must record a different mergepoint. It's normal - don't worry about it. Tony