/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/shelf_ui.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/shelf_ui.py
466
466
                if unshelver.message is not None:
467
467
                    trace.note(gettext('Message: %s') % unshelver.message)
468
468
                change_reporter = delta._ChangeReporter()
469
 
                merger = unshelver.make_merger(None)
 
469
                merger = unshelver.make_merger()
470
470
                merger.change_reporter = change_reporter
471
471
                if self.apply_changes:
472
472
                    merger.do_merge()