/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_branch/test_branch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-27 16:29:55 UTC
  • mfrom: (6719.1.4 more-deprecations)
  • Revision ID: breezy.the.bot@gmail.com-20170627162955-9krxsz2s68v7h24i
Remove some more already deprecated arguments.

Merged from https://code.launchpad.net/~jelmer/brz/more-deprecations/+merge/326342

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_branch.py
1028
1028
        checkout.commit('bar')
1029
1029
        tree.lock_write()
1030
1030
        self.addCleanup(tree.unlock)
1031
 
        merger = merge.Merger.from_revision_ids(None, tree,
 
1031
        merger = merge.Merger.from_revision_ids(tree,
1032
1032
                                                branch.last_revision(),
1033
1033
                                                other_branch=branch)
1034
1034
        merger.merge_type = merge.Merge3Merger