/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 bzrlib/shelf.py

  • Committer: Robert Collins
  • Date: 2009-02-06 03:47:05 UTC
  • mto: This revision was merged to the branch mainline in revision 3987.
  • Revision ID: robertc@robertcollins.net-20090206034705-i3xvyq06qi5svxjd
https://launchpad.net/bugs/319790
Fix bug 319790 - unshelve of deleted paths failing.

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()