← 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: 2006-09-04 08:00:00 UTC
  • mto: (1981.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1982.
  • Revision ID: robertc@robertcollins.net-20060904080000-1152da5eed765694
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
967
967
        DependencyNotPresent.__init__(self, 'paramiko', error)
968
968
 
969
969
 
 
970
class PointlessMerge(BzrNewError):
 
971
    """Nothing to merge."""
 
972
 
 
973
 
970
974
class UninitializableFormat(BzrNewError):
971
975
    """Format %(format)s cannot be initialised by this version of bzr."""
972
976