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.
> 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. If the situation is: ---- |1.1 | ---- | ------ | br1 | ------- |1.1.1 | - |1.1.1.1| ------ ------- which is created by command "cvs update -j HEAD" in branch br1 and then somebody in in HEAD sandbox issue the command "cvs update -j br1" cvs creates this: ---- ---- |1.1 | - |1.2 | ---- ---- | ------ | br1 | ------- |1.1.1 | - |1.1.1.1| ------ ------- and consequently the following "cvs update -j HEAD" in branch br1 adds version 1.1.1.2 and it's never going to stop. Jan