/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/errors.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-17 09:43:24 UTC
  • mfrom: (7045.1.9 python3-o)
  • Revision ID: breezy.the.bot@gmail.com-20180717094324-sejdvmx3kha2zeq8
Fix another ~500 tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-o/+merge/349632

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/errors.py
1407
1407
        BzrError.__init__(self, basedir=tree.basedir)
1408
1408
 
1409
1409
 
1410
 
class CantReprocessAndShowBase(BzrError):
1411
 
 
1412
 
    _fmt = ("Can't reprocess and show base, because reprocessing obscures "
1413
 
           "the relationship of conflicting lines to the base")
1414
 
 
1415
 
 
1416
1410
class GraphCycleError(BzrError):
1417
1411
 
1418
1412
    _fmt = "Cycle in graph %(graph)r"