← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-12 06:11:32 UTC
  • mfrom: (1649.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060412061132-beffbe6feb9bc734
Make push and pull converge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
394
394
 
395
395
 
396
396
class DivergedBranches(BzrError):
 
397
 
397
398
    def __init__(self, branch1, branch2):
398
399
        BzrError.__init__(self, "These branches have diverged.  Try merge.")
399
400
        self.branch1 = branch1