← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Aaron Bentley
  • Date: 2007-12-09 22:58:47 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071209225847-742dknf7ywjzv5uo
Prevent reverse cherry-picking with weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1101
1101
            " no merge base revision was specified.")
1102
1102
 
1103
1103
 
 
1104
class CannotReverseCherrypick(BzrError):
 
1105
 
 
1106
    _fmt = ('Selected merge cannot perform reverse cherrypicks.  Try merge3'
 
1107
            ' or diff3.')
 
1108
 
 
1109
 
1104
1110
class NoCommonAncestor(BzrError):
1105
1111
    
1106
1112
    _fmt = "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"