← 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: Canonical.com Patch Queue Manager
  • Date: 2008-01-03 23:18:14 UTC
  • mfrom: (3146.5.4 test-merge-uncommitted)
  • Revision ID: pqm@pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
Make merge --uncommitted work with merge-type weave/lca (abentley)

Show diffs side-by-side

added added

removed removed

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