Merge lp:~jameinel/bzr/weave_conflict_delete_328171 into lp:~bzr/bzr/trunk-old

[John A Meinel]

[John A Meinel (jameinel)]

Fixes bug #328171 by considering 'killed-both' to be a change on both sides.

This should be fine, considering the earlier code that has 'killed-a' set 'ch_a = True', etc.

We already check if both sides are considered 'changed' whether the actual content is identical (lines_a == lines_b).

=== modified file 'NEWS'
--- NEWS	2009-05-01 07:59:02 +0000
+++ NEWS	2009-05-01 19:35:11 +0000
@@ -38,6 +38,9 @@
 * Adding now works properly when path contains a symbolic link.
   (Geoff Bache, #183831)
 
+* ``bzr merge --weave`` will now generate a conflict if one side deletes a
+  line, and the other side modifies the line. (John Arbash Meinel, #328171)
+
 * ``bzr send`` works to send emails again using MAPI.
   (Neil Martinsen-Burrell, #346998)
 

=== modified file 'bzrlib/tests/test_merge.py'
--- bzrlib/tests/test_merge.py	2009-03-24 01:53:42 +0000
+++ bzrlib/tests/test_merge.py	2009-05-01 19:35:11 +0000
@@ -1095,6 +1095,52 @@
             '>>>>>>> MERGE-SOURCE\n'
             'line 4\n', 'this/file1')
 
+    def test_modify_conflicts_with_delete(self):
+        # If one side deletes a line, and the other modifies that line, then
+        # the modification should be considered a conflict
+        builder = self.make_branch_builder('test')
+        builder.start_series()
+        builder.build_snapshot('BASE-id', None,
+            [('add', ('', None, 'directory', None)),
+             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
+            ])
+        # Delete 'b\n'
+        builder.build_snapshot('OTHER-id', ['BASE-id'],
+            [('modify', ('foo-id', 'a\nc\nd\ne\n'))])
+        # Modify 'b\n', add 'X\n'
+        builder.build_snapshot('THIS-id', ['BASE-id'],
+            [('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))])
+        builder.finish_series()
+        branch = builder.get_branch()
+        this_tree = branch.bzrdir.create_workingtree()
+        this_tree.lock_write()
+        self.addCleanup(this_tree.unlock)
+        other_tree = this_tree.bzrdir.sprout('other', 'OTHER-id').open_workingtree()
+        self.do_merge(this_tree, other_tree)
+        if self.merge_type is _mod_merge.LCAMerger:
+            self.expectFailure("lca merge doesn't track deleted lines",
+                self.assertFileEqual,
+                    'a\n'
+                    '<<<<<<< TREE\n'
+                    'b2\n'
+                    '=======\n'
+                    '>>>>>>> MERGE-SOURCE\n'
+                    'c\n'
+                    'd\n'
+                    'X\n'
+                    'e\n', 'test/foo')
+        else:
+            self.assertFileEqual(
+                'a\n'
+                '<<<<<<< TREE\n'
+                'b2\n'
+                '=======\n'
+                '>>>>>>> MERGE-SOURCE\n'
+                'c\n'
+                'd\n'
+                'X\n'
+                'e\n', 'test/foo')
+
 
 class TestMerge3Merge(TestCaseWithTransport, TestMergeImplementation):
 

=== modified file 'bzrlib/tests/test_versionedfile.py'
--- bzrlib/tests/test_versionedfile.py	2009-04-09 20:23:07 +0000
+++ bzrlib/tests/test_versionedfile.py	2009-05-01 19:35:11 +0000
@@ -1152,6 +1152,10 @@
             """
         result = """\
             line 1
+<<<<<<<\x20
+            line 2
+=======
+>>>>>>>\x20
             """
         self._test_merge_from_strings(base, a, b, result)
 

=== modified file 'bzrlib/versionedfile.py'
--- bzrlib/versionedfile.py	2009-04-09 20:23:07 +0000
+++ bzrlib/versionedfile.py	2009-05-01 19:35:11 +0000
@@ -1403,9 +1403,13 @@
             elif state == 'conflicted-b':
                 ch_b = ch_a = True
                 lines_b.append(line)
+            elif state == 'killed-both':
+                # This counts as a change, even though there is no associated
+                # line
+                ch_b = ch_a = True
             else:
                 if state not in ('irrelevant', 'ghost-a', 'ghost-b',
-                        'killed-base', 'killed-both'):
+                        'killed-base'):
                     raise AssertionError(state)
         for struct in outstanding_struct():
             yield struct