/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 bzrlib/errors.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-04 08:44:08 UTC
  • mfrom: (1981.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060904084408-ebdbb37a1cdb0c53
(robertc) integrate merge_from_branch patch: adds a convenience method "merge_from_branch" to WorkingTree.

Show diffs side-by-side

added added

removed removed

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