equal
deleted
inserted
replaced
1 $ cat <<EOF > merge |
1 $ cat <<EOF > merge |
2 > from __future__ import print_function |
|
3 > import sys, os |
2 > import sys, os |
4 > |
3 > |
5 > try: |
4 > try: |
6 > import msvcrt |
5 > import msvcrt |
7 > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) |
6 > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) |
352 This test is now "best effort" as the mechanism to prevent such race are |
351 This test is now "best effort" as the mechanism to prevent such race are |
353 getting better, it get more complicated to test a specific scenario that would |
352 getting better, it get more complicated to test a specific scenario that would |
354 trigger it. If you see flakyness here, there is a race. |
353 trigger it. If you see flakyness here, there is a race. |
355 |
354 |
356 $ cat > $TESTTMP/abort.py <<EOF |
355 $ cat > $TESTTMP/abort.py <<EOF |
357 > from __future__ import absolute_import |
|
358 > # emulate aborting before "recordupdates()". in this case, files |
356 > # emulate aborting before "recordupdates()". in this case, files |
359 > # are changed without updating dirstate |
357 > # are changed without updating dirstate |
360 > from mercurial import ( |
358 > from mercurial import ( |
361 > error, |
359 > error, |
362 > extensions, |
360 > extensions, |