Mercurial > hg > mercurial-source
changeset 34751:06a740540ea1
tests: update test-merge1 to pass our import checker
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 22 Aug 2017 16:58:43 -0400 |
parents | 00658bb0dfd5 |
children | cefad71d1a45 |
files | tests/test-merge1.t |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge1.t +++ b/tests/test-merge1.t @@ -340,9 +340,14 @@ isn't changed on the filesystem (see also issue4583). $ cat > $TESTTMP/abort.py <<EOF + > from __future__ import absolute_import > # emulate aborting before "recordupdates()". in this case, files > # are changed without updating dirstate - > from mercurial import extensions, merge, error + > from mercurial import ( + > error, + > extensions, + > merge, + > ) > def applyupdates(orig, *args, **kwargs): > orig(*args, **kwargs) > raise error.Abort('intentional aborting')