← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-10 17:52:08 UTC
  • mfrom: (5021 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100210175208-bubuwav4uqigu291
Merge bzr.dev 5021 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_merger.py
46
46
class TestMergeImplementation(TestCaseWithTransport):
47
47
 
48
48
    def do_merge(self, target_tree, source_tree, **kwargs):
49
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
 
49
        merger = _mod_merge.Merger.from_revision_ids(None,
50
50
            target_tree, source_tree.last_revision(),
51
51
            other_branch=source_tree.branch)
52
52
        merger.merge_type=self.merge_type