Bug 177314

Description prabhu 2007-03-14 08:07:49 EDT

Build ID: 3.2.1

Steps To Reproduce:
We are using CVS for development. When we want to merge a local code with remote code in repository, the compare/merge tool doesn't work properly in certain cases. 
Lets assume we want to merge a local file A in remote repository. Assume the same block has been modified in local and remote versions.

1. Bring up the compare/merge window for file A by clicking on the file in Synchronize view.
2. Click on the block in remote file (right side).
3. The "Copy current change from Right to Left" (Lets call it as RCBtn) is enabled which is correct.
4. With the keyboard cursor still in the right side block, click on the RCBtn. The block from right side will be appended to the left side which is correct.
5. The RCBtn is still enabled which is incorrect.
6. Click on save.
7. The RCBtn is still enabled which is incorrect.
8. When you click on RCBtn, it will again append the content to the local source making 2 copy's of the right side block which is incorrect.

P.S.
It would be better if you could add a similar functionality for directly copying blocks from 'common ancestor' as it is done in clearcase compare merge tool.

More information: