Mercurial > hg
comparison tests/test-merge1.t @ 33968: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 | 24849d53697d |
children | 33c8a6837181 |
comparison
equal
deleted
inserted
replaced
33967:00658bb0dfd5 | 33968:06a740540ea1 |
---|---|
338 'merge.update()' is aborted before 'merge.recordupdates()' (= parents | 338 'merge.update()' is aborted before 'merge.recordupdates()' (= parents |
339 aren't changed), even if none of mode, size and timestamp of them | 339 aren't changed), even if none of mode, size and timestamp of them |
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') |
349 > def extsetup(ui): | 354 > def extsetup(ui): |
350 > extensions.wrapfunction(merge, "applyupdates", applyupdates) | 355 > extensions.wrapfunction(merge, "applyupdates", applyupdates) |