Merge branches is not atomic

ajj3085 · Post by **ajj3085** » Fri Feb 08, 2008 8:07 am

Hi,

It looks like the Merge branches command is not atomic. If there are renames, they are commited to the target branch, not just added to the change set. If you end up not completing the merge, you now have some changes made, and other changes which were not made.

Andy

lbauer · Post by **lbauer** » Fri Feb 08, 2008 6:02 pm

That's correct. The merge tool tells you that any items checked in the Rename portion of Merge Branches will be committed immediately to the repository. I assume you'd like that behavior to be different?

ajj3085 · Post by **ajj3085** » Mon Feb 11, 2008 7:23 am

Yes. Should the merge not be completed successfully, you now have code in an inconsistent state. Changes made to file after a rename are not performed. The next attempt at a merge then says it can't find the file, even though the names do now match. (I.e. you have to tell it to merge Company.cs with Company.cs, where company was previously organization).