← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
768
768
    def test_from_revision_ids(self):
769
769
        this, other = self.set_up_trees()
770
770
        self.assertRaises(errors.NoSuchRevision, Merger.from_revision_ids,
771
 
                          progress.DummyProgress(), this, 'rev2b')
 
771
                          None, this, 'rev2b')
772
772
        this.lock_write()
773
773
        self.addCleanup(this.unlock)
774
 
        merger = Merger.from_revision_ids(progress.DummyProgress(), this,
 
774
        merger = Merger.from_revision_ids(None, this,
775
775
            'rev2b', other_branch=other.branch)
776
776
        self.assertEqual('rev2b', merger.other_rev_id)
777
777
        self.assertEqual('rev1', merger.base_rev_id)
778
 
        merger = Merger.from_revision_ids(progress.DummyProgress(), this,
 
778
        merger = Merger.from_revision_ids(None, this,
779
779
            'rev2b', 'rev2a', other_branch=other.branch)
780
780
        self.assertEqual('rev2a', merger.base_rev_id)
781
781
 
782
782
    def test_from_uncommitted(self):
783
783
        this, other = self.set_up_trees()
784
 
        merger = Merger.from_uncommitted(this, other, progress.DummyProgress())
 
784
        merger = Merger.from_uncommitted(this, other, None)
785
785
        self.assertIs(other, merger.other_tree)
786
786
        self.assertIs(None, merger.other_rev_id)
787
787
        self.assertEqual('rev2b', merger.base_rev_id)
800
800
        other.lock_read()
801
801
        self.addCleanup(other.unlock)
802
802
        merger, verified = Merger.from_mergeable(this, md,
803
 
            progress.DummyProgress())
 
803
            None)
804
804
        md.patch = None
805
805
        merger, verified = Merger.from_mergeable(this, md,
806
 
            progress.DummyProgress())
 
806
            None)
807
807
        self.assertEqual('inapplicable', verified)
808
808
        self.assertEqual('rev3', merger.other_rev_id)
809
809
        self.assertEqual('rev1', merger.base_rev_id)
810
810
        md.base_revision_id = 'rev2b'
811
811
        merger, verified = Merger.from_mergeable(this, md,
812
 
            progress.DummyProgress())
 
812
            None)
813
813
        self.assertEqual('rev2b', merger.base_rev_id)
814
814
 
815
815
    def test_from_mergeable_old_merge_directive(self):
819
819
        md = merge_directive.MergeDirective.from_objects(
820
820
            other.branch.repository, 'rev3', 0, 0, 'this')
821
821
        merger, verified = Merger.from_mergeable(this, md,
822
 
            progress.DummyProgress())
 
822
            None)
823
823
        self.assertEqual('rev3', merger.other_rev_id)
824
824
        self.assertEqual('rev1', merger.base_rev_id)