← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

Merge shell-like-tests into description

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