← Back to branch summary

~jelmer/brz/fix-c-extensions

« back to all changes in this revision

Viewing changes to breezy/tests/per_merger.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

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