← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

test_merge_move_and_change should still be an expected fail for LCA merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_merger.py
98
98
        this_tree.commit('Swapped 2 & 3')
99
99
        self.do_merge(this_tree, other_tree)
100
100
        if self.merge_type is _mod_merge.LCAMerger:
101
 
            # lca merge doesn't conflict for move and change
102
 
            self.assertFileEqual('line 1\n'
 
101
            self.expectFailure(
 
102
                "lca merge doesn't conflict for move and change",
 
103
                self.assertFileEqual,
 
104
                'line 1\n'
 
105
                '<<<<<<< TREE\n'
 
106
                'line 3\n'
 
107
                'line 2\n'
 
108
                '=======\n'
103
109
                'line 2 to 2.1\n'
104
110
                'line 3\n'
105
 
                'line 2\n'
 
111
                '>>>>>>> MERGE-SOURCE\n'
106
112
                'line 4\n', 'this/file1')
107
113
        else:
108
114
            self.assertFileEqual('line 1\n'