← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Ian Clatworthy
  • Date: 2009-02-09 23:33:58 UTC
  • mfrom: (3955.3.10 open-in-launchpad)
  • mto: This revision was merged to the branch mainline in revision 3992.
  • Revision ID: ian.clatworthy@canonical.com-20090209233358-87e0072zgnkomb6v
Command for opening Launchpad pages (Jonathan Lange)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
264
264
        tt.deserialize(records)
265
265
        return klass(tree, base_tree, tt, metadata.get('message'))
266
266
 
267
 
 
268
267
    def make_merger(self):
269
268
        """Return a merger that can unshelve the changes."""
270
269
        pb = ui.ui_factory.nested_progress_bar()