← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-10-17 02:49:15 UTC
  • mto: (0.16.77 shelf-ui)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081017024915-nv4pi55p778s51q7
Update for new Unshelver API

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
401
401
        shelf_id = shelf_manager.shelve_changes(creator)
402
402
        self.failIfExists('tree/foo')
403
403
        unshelver = shelf_manager.get_unshelver(shelf_id)
404
 
        unshelver.unshelve()
 
404
        unshelver.make_merger().do_merge()
405
405
        self.assertFileEqual('bar', 'tree/foo')