← 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: Patch Queue Manager
  • Date: 2012-01-03 13:21:09 UTC
  • mfrom: (6410.1.1 propagate-other-branch)
  • Revision ID: pqm@pqm.ubuntu.com-20120103132109-12fugun039vg5r6v
(jelmer) Add an "other_branch" argument to Merge3Merger.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
446
446
        merger.merge_type = _mod_merge.Merge3Merger
447
447
        tree_merger = merger.make_merger()
448
448
        self.assertIs(_mod_merge.Merge3Merger, tree_merger.__class__)
449
 
        self.assertEqual('rev2b', tree_merger.other_tree.get_revision_id())
450
 
        self.assertEqual('rev1', tree_merger.base_tree.get_revision_id())
 
449
        self.assertEqual('rev2b',
 
450
            tree_merger.other_tree.get_revision_id())
 
451
        self.assertEqual('rev1',
 
452
            tree_merger.base_tree.get_revision_id())
 
453
        self.assertEqual(other_tree.branch, tree_merger.other_branch)
451
454
 
452
455
    def test_make_preview_transform(self):
453
456
        this_tree = self.make_branch_and_tree('this')