← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
18
18
from bzrlib.lazy_import import lazy_import
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: