##// END OF EJS Templates
tests: update test-merge1 to pass our import checker
Augie Fackler -
r33970:06a74054 default
parent child Browse files
Show More
@@ -340,9 +340,14 b" aren't changed), even if none of mode, s"
340 isn't changed on the filesystem (see also issue4583).
340 isn't changed on the filesystem (see also issue4583).
341
341
342 $ cat > $TESTTMP/abort.py <<EOF
342 $ cat > $TESTTMP/abort.py <<EOF
343 > from __future__ import absolute_import
343 > # emulate aborting before "recordupdates()". in this case, files
344 > # emulate aborting before "recordupdates()". in this case, files
344 > # are changed without updating dirstate
345 > # are changed without updating dirstate
345 > from mercurial import extensions, merge, error
346 > from mercurial import (
347 > error,
348 > extensions,
349 > merge,
350 > )
346 > def applyupdates(orig, *args, **kwargs):
351 > def applyupdates(orig, *args, **kwargs):
347 > orig(*args, **kwargs)
352 > orig(*args, **kwargs)
348 > raise error.Abort('intentional aborting')
353 > raise error.Abort('intentional aborting')
General Comments 0
You need to be logged in to leave comments. Login now