/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.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/shelf.py
344
344
        tt.deserialize(records)
345
345
        return klass(tree, base_tree, tt, metadata.get('message'))
346
346
 
347
 
    def make_merger(self, task=None):
 
347
    def make_merger(self):
348
348
        """Return a merger that can unshelve the changes."""
349
349
        target_tree = self.transform.get_preview_tree()
350
350
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
351
 
            task, self.base_tree)
 
351
            self.base_tree)
352
352
        merger.merge_type = merge.Merge3Merger
353
353
        return merger
354
354