Rev 4635: Creating helpers for 'name conflicts' may conflict with the helpers created bfor ContentConflicts, bzrlib.tests.test_transform.TestTransformMerge.test_filename_merge_conflicts fails with this fix. in file:///home/vila/src/bzr/bugs/531967-unify-name-conflicts/

Vincent Ladeuil v.ladeuil+lp at free.fr
Tue Mar 9 16:24:31 GMT 2010


At file:///home/vila/src/bzr/bugs/531967-unify-name-conflicts/

------------------------------------------------------------
revno: 4635
revision-id: v.ladeuil+lp at free.fr-20100309162431-hkp98mkfmprus54s
parent: v.ladeuil+lp at free.fr-20100309152427-kek9vs3hcmdmlu6s
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 531967-unify-name-conflicts
timestamp: Tue 2010-03-09 17:24:31 +0100
message:
  Creating helpers for 'name conflicts' may conflict with the helpers created bfor ContentConflicts, bzrlib.tests.test_transform.TestTransformMerge.test_filename_merge_conflicts fails with this fix.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2010-03-09 15:24:27 +0000
+++ b/bzrlib/merge.py	2010-03-09 16:24:31 +0000
@@ -1232,6 +1232,8 @@
         if name_winner == "this" and parent_id_winner == "this":
             return
         if name_winner == 'conflict' or parent_id_winner == 'conflict':
+            # Creating helpers here cause problems down the road if a
+            # ContentConflict needs to be created so we should not do that
             if other_name is None or other_parent is None:
                 # 'other' has been deleted, leave a .THIS
                 parent_id = self.tt.trans_id_file_id(this_parent)



More information about the bazaar-commits mailing list