~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to command_classes.py

  • Committer: Aaron Bentley
  • Date: 2011-04-12 04:51:37 UTC
  • Revision ID: aaron@aaronbentley.com-20110412045137-ni3eart33v4wnlst
Allow zap --branch --store if no uncommitted changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
409
409
                import bzrlib.plugins.pipeline
410
410
            except ImportError:
411
411
                raise BzrCommandError('--store requires bzr-pipeline.')
412
 
            if branch:
413
 
                raise BzrCommandError('Cannot store changes in branch, then'
414
 
                                      ' delete branch.')
415
412
        return zap(checkout, remove_branch=branch, policy=change_policy)
416
413
 
417
414