← 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: 2005-10-27 23:43:15 UTC
  • mfrom: (1185.24.3)
  • mto: (1185.35.8)
  • mto: This revision was merged to the branch mainline in revision 1491.
  • Revision ID: abentley@panoramicfeedback.com-20051027234315-1f51cfe5a0303e31
Merged reprocessing for merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
391
391
                          " last commit, but weave merge requires that it be"
392
392
                          " unchanged." % tree.basedir)
393
393
 
 
394
class CantReprocessAndShowBase(BzrNewError):
 
395
    """Can't reprocess and show base.
 
396
Reprocessing obscures relationship of conflicting lines to base."""
 
397
 
394
398
class GraphCycleError(BzrNewError):
395
399
    """Cycle in graph %(graph)r"""
396
400
    def __init__(self, graph):