← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-16 16:54:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080716165406-3ctahm7c3fafi3qy
Review feedback from Ian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1058
1058
        self.build_tree_contents([
1059
1059
            ('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
1060
1060
        ])
1061
 
        other_tree.commit('Swapped 2 & 3')
 
1061
        other_tree.commit('Changed 2 to 2.1')
1062
1062
        self.build_tree_contents([
1063
1063
            ('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
1064
1064
        ])
1065
 
        this_tree.commit('Changed 2 to 2.1')
 
1065
        this_tree.commit('Swapped 2 & 3')
1066
1066
        self.do_merge(this_tree, other_tree)
1067
1067
        self.assertFileEqual('line 1\n'
1068
1068
            '<<<<<<< TREE\n'