← Back to branch summary

~nmb/bzr-colo/qcolo

« back to all changes in this revision

Viewing changes to commands.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2011-05-06 16:19:44 UTC
  • Revision ID: nmb@wartburg.edu-20110506161944-34jkkrkvi5srtfyv
add qcolomerge command and window and get trees with changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
669
669
        raise NoQBzrError(name='qprune')
670
670
 
671
671
 
 
672
class cmd_qcolomerge(commands.Command):
 
673
 
 
674
    """Merge colocated branches (requires qbzr)"""
 
675
 
 
676
    def run(self):
 
677
        raise NoQBzrError(name='qcolomerge')
 
678
 
 
679
 
672
680
qbzr = None
673
681
try:
674
682
    import bzrlib.plugins.qbzr as qbzr
681
689
else:
682
690
    cmd_qprune = qcommands.cmd_qprune
683
691
    cmd_qbranches = qcommands.cmd_qbranches
 
692
    cmd_qcolomerge = qcommands.cmd_qcolomerge
684
693
 
685
694
 
686
695
class NoSavedSyncLocation(errors.BzrCommandError):