--- a/tests/test-bundle2-exchange.t Mon Oct 05 22:49:24 2015 -0700
+++ b/tests/test-bundle2-exchange.t Thu Oct 08 12:55:45 2015 -0700
@@ -453,7 +453,7 @@
> used to test error handling in bundle2
> """
>
- > from mercurial import util
+ > from mercurial import error
> from mercurial import bundle2
> from mercurial import exchange
> from mercurial import extensions
@@ -471,7 +471,7 @@
>
> @bundle2.parthandler("test:abort")
> def handleabort(op, part):
- > raise util.Abort('Abandon ship!', hint="don't panic")
+ > raise error.Abort('Abandon ship!', hint="don't panic")
>
> def uisetup(ui):
> exchange.b2partsgenmapping['failpart'] = _pushbundle2failpart