diff -r 448725a2ef73 -r 61714510220d tests/test-transplant.t --- a/tests/test-transplant.t Fri Sep 15 00:01:57 2017 -0700 +++ b/tests/test-transplant.t Sun Sep 03 16:45:33 2017 +0900 @@ -884,7 +884,7 @@ $ cat > $TESTTMP/abort.py < # emulate that patch.patch() is aborted at patching on "abort" file - > from mercurial import extensions, patch as patchmod + > from mercurial import error, extensions, patch as patchmod > def patch(orig, ui, repo, patchname, > strip=1, prefix='', files=None, > eolmode='strict', similarity=0): @@ -894,7 +894,7 @@ > strip=strip, prefix=prefix, files=files, > eolmode=eolmode, similarity=similarity) > if 'abort' in files: - > raise patchmod.PatchError('intentional error while patching') + > raise error.PatchError('intentional error while patching') > return r > def extsetup(ui): > extensions.wrapfunction(patchmod, 'patch', patch)