diff -r d51c658d3f04 -r 56b2bcea2529 tests/test-annotate.t
--- a/tests/test-annotate.t	Mon Oct 05 22:49:24 2015 -0700
+++ b/tests/test-annotate.t	Thu Oct 08 12:55:45 2015 -0700
@@ -299,7 +299,7 @@
 and its ancestor by overriding "repo._filecommit".
 
   $ cat > ../legacyrepo.py <<EOF
-  > from mercurial import node, util
+  > from mercurial import node, error
   > def reposetup(ui, repo):
   >     class legacyrepo(repo.__class__):
   >         def _filecommit(self, fctx, manifest1, manifest2,
@@ -312,12 +312,12 @@
   >             meta = {}
   >             copy = fctx.renamed()
   >             if copy and copy[0] != fname:
-  >                 raise util.Abort('copying is not supported')
+  >                 raise error.Abort('copying is not supported')
   >             if fparent2 != node.nullid:
   >                 changelist.append(fname)
   >                 return flog.add(text, meta, tr, linkrev,
   >                                 fparent1, fparent2)
-  >             raise util.Abort('only merging is supported')
+  >             raise error.Abort('only merging is supported')
   >     repo.__class__ = legacyrepo
   > EOF