← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Martin Pool
  • Date: 2005-08-25 00:47:04 UTC
  • Revision ID: mbp@sourcefrog.net-20050825004704-e3c75123f29539bf
- expose 'find-merge-base' as a new expert command,
  to help in debugging merges

  move UnrelatedBranches exception into bzrlib.errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
92
92
        BzrError.__init__(self, msg)
93
93
 
94
94
 
 
95
class UnrelatedBranches(BzrCommandError):
 
96
    def __init__(self):
 
97
        msg = "Branches have no common ancestor, and no base revision"\
 
98
            " specified."
 
99
        BzrCommandError.__init__(self, msg)
 
100
 
 
101