← 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: Aaron Bentley
  • Date: 2007-12-30 20:08:25 UTC
  • mto: This revision was merged to the branch mainline in revision 3164.
  • Revision ID: aaron.bentley@utoronto.ca-20071230200825-fghiumyk7wux7olv
Make merge --uncommitted work with merge-type weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
288
288
        merger.do_merge()
289
289
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
290
290
 
 
291
    def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis_weave(self):
 
292
        tree_a = self.make_branch_and_tree('a')
 
293
        self.build_tree(['a/file_1', 'a/file_2'])
 
294
        tree_a.add(['file_1'])
 
295
        tree_a.commit('commit 1')
 
296
        tree_a.add(['file_2'])
 
297
        tree_a.commit('commit 2')
 
298
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
299
        tree_b.rename_one('file_1', 'renamed')
 
300
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
 
301
                                                    progress.DummyProgress())
 
302
        merger.merge_type = _mod_merge.WeaveMerger
 
303
        merger.do_merge()
 
304
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
 
305
 
291
306
    def prepare_cherrypick(self):
292
307
        """Prepare a pair of trees for cherrypicking tests.
293
308