Show More
@@ -26,7 +26,6 b" while we're running" | |||||
26 | > cat "\$@" |
|
26 | > cat "\$@" | |
27 | > fi |
|
27 | > fi | |
28 | > EOF |
|
28 | > EOF | |
29 | $ chmod +x "$TESTTMP/waitlock_editor.sh" |
|
|||
30 |
|
29 | |||
31 | Things behave differently if we don't already have a 00changelog.i file when |
|
30 | Things behave differently if we don't already have a 00changelog.i file when | |
32 | this all starts, so let's make one. |
|
31 | this all starts, so let's make one. | |
@@ -49,11 +48,11 b' Start an hg commit that will take a whil' | |||||
49 | $ echo foo > foo |
|
48 | $ echo foo > foo | |
50 | $ (WAITLOCK_ANNOUNCE="${EDITOR_STARTED}" \ |
|
49 | $ (WAITLOCK_ANNOUNCE="${EDITOR_STARTED}" \ | |
51 | > WAITLOCK_FILE="${MISCHIEF_MANAGED}" \ |
|
50 | > WAITLOCK_FILE="${MISCHIEF_MANAGED}" \ | |
52 | > HGEDITOR="$TESTTMP/waitlock_editor.sh" \ |
|
51 | > HGEDITOR="sh $TESTTMP/waitlock_editor.sh" \ | |
53 | > hg commit -qAm 'r1 (foo)' --edit foo > .foo_commit_out 2>&1 ; touch "${JOBS_FINISHED}") & |
|
52 | > hg commit -qAm 'r1 (foo)' --edit foo > .foo_commit_out 2>&1 ; touch "${JOBS_FINISHED}") & | |
54 |
|
53 | |||
55 | Wait for the "editor" to actually start |
|
54 | Wait for the "editor" to actually start | |
56 | $ WAITLOCK_FILE="${EDITOR_STARTED}" "$TESTTMP/waitlock_editor.sh" |
|
55 | $ WAITLOCK_FILE="${EDITOR_STARTED}" sh "$TESTTMP/waitlock_editor.sh" | |
57 |
|
56 | |||
58 | Break the locks, and make another commit. |
|
57 | Break the locks, and make another commit. | |
59 | $ hg debuglocks -LW |
|
58 | $ hg debuglocks -LW | |
@@ -67,7 +66,7 b' Break the locks, and make another commit' | |||||
67 | Awaken the editor from that first commit |
|
66 | Awaken the editor from that first commit | |
68 | $ touch "${MISCHIEF_MANAGED}" |
|
67 | $ touch "${MISCHIEF_MANAGED}" | |
69 | And wait for it to finish |
|
68 | And wait for it to finish | |
70 | $ WAITLOCK_FILE="${JOBS_FINISHED}" "$TESTTMP/waitlock_editor.sh" |
|
69 | $ WAITLOCK_FILE="${JOBS_FINISHED}" sh "$TESTTMP/waitlock_editor.sh" | |
71 |
|
70 | |||
72 | #if skip-detection |
|
71 | #if skip-detection | |
73 | (Ensure there was no output) |
|
72 | (Ensure there was no output) |
General Comments 0
You need to be logged in to leave comments.
Login now