← 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-12-15 03:21:11 UTC
  • mfrom: (1185.56.2 fixes)
  • Revision ID: robertc@robertcollins.net-20051215032111-e68d5e6ffbd4b574
* Raise NoSuchFile when someone tries to add a non-existant file.
  (Michael Ellerman)

* Simplify handling of DivergedBranches in cmd_pull().
  (Michael Ellerman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
276
276
 
277
277
class DivergedBranches(BzrError):
278
278
    def __init__(self, branch1, branch2):
279
 
        BzrError.__init__(self, "These branches have diverged.")
 
279
        BzrError.__init__(self, "These branches have diverged.  Try merge.")
280
280
        self.branch1 = branch1
281
281
        self.branch2 = branch2
282
282