← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Robert Collins
  • Date: 2005-10-30 00:00:09 UTC
  • mfrom: (1185.16.134)
  • Revision ID: robertc@robertcollins.net-20051030000009-9db99a338a0dfdac
Merge from Martin.

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):