/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_ui.py

  • Committer: Martin Pool
  • Date: 2009-12-11 05:48:21 UTC
  • mto: This revision was merged to the branch mainline in revision 4892.
  • Revision ID: mbp@sourcefrog.net-20091211054821-wolkr2xhx5xt37je
https://launchpad.net/bugs/492091
New option unshelve --keep

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
414
414
            if action == 'dry-run':
415
415
                apply_changes = False
416
416
                delete_shelf = False
417
 
            if action == 'delete-only':
 
417
            elif action == 'delete-only':
418
418
                apply_changes = False
419
419
                read_shelf = False
 
420
            elif action == 'keep':
 
421
                apply_changes = True
 
422
                delete_shelf = False
420
423
        except:
421
424
            tree.unlock()
422
425
            raise