← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
92
92
        # doesn't always fail at get() time. Sometimes it fails
93
93
        # during read. And that raises a generic IOError with
94
94
        # just the string 'Failure'
95
 
        # StubSFTPServer does fail during get() (because of prefetch) 
 
95
        # StubSFTPServer does fail during get() (because of prefetch)
96
96
        # so it has an opportunity to translate the error.
97
97
        raise errors.NotABundle(str(e))
98
98
    except errors.NotAMergeDirective: