--- a/tests/test-mq-qfold.t Mon Oct 05 22:49:24 2015 -0700
+++ b/tests/test-mq-qfold.t Thu Oct 08 12:55:45 2015 -0700
@@ -149,11 +149,11 @@
$ hg qrefresh -m "original message"
$ cat > $TESTTMP/commitfailure.py <<EOF
- > from mercurial import util
+ > from mercurial import error
> def reposetup(ui, repo):
> class commitfailure(repo.__class__):
> def commit(self, *args, **kwargs):
- > raise util.Abort('emulating unexpected abort')
+ > raise error.Abort('emulating unexpected abort')
> repo.__class__ = commitfailure
> EOF