Skip to content
Snippets Groups Projects
Commit 34a8ef35 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

test-dirstate-race: hide irrelevant hg status output

See the explanation for more.

Differential Revision: https://phab.mercurial-scm.org/D153
parent a41e0f1c
No related branches found
No related tags found
No related merge requests found
......@@ -204,8 +204,12 @@
$ hg commit -m c4
created new head
Configure a merge tool that runs status in the middle of the rebase.
Configure a merge tool that runs status in the middle of the rebase. The goal of
the status call is to trigger a potential bug if fsmonitor's state is written
even though the wlock is held by another process. The output of 'hg status' in
the merge tool goes to /dev/null because we're more interested in the results of
'hg status' run after the rebase.
$ cat >> $TESTTMP/mergetool-race.sh << EOF
> echo "custom merge tool"
> printf "c2\nc3\nc4\n" > \$1
......@@ -208,8 +212,8 @@
$ cat >> $TESTTMP/mergetool-race.sh << EOF
> echo "custom merge tool"
> printf "c2\nc3\nc4\n" > \$1
> hg --cwd "$TESTTMP/repo" status
> hg --cwd "$TESTTMP/repo" status > /dev/null
> echo "custom merge tool end"
> EOF
$ cat >> $HGRCPATH << EOF
......@@ -220,8 +224,7 @@
> test.args=$TESTTMP/mergetool-race.sh \$output
> EOF
BROKEN: the "M b" line should not be there
$ hg rebase -s . -d 3 --tool test
rebasing 4:b08445fd6b2a "c4" (tip)
merging a
custom merge tool
......@@ -224,10 +227,7 @@
$ hg rebase -s . -d 3 --tool test
rebasing 4:b08445fd6b2a "c4" (tip)
merging a
custom merge tool
M a
M b
? a.orig
custom merge tool end
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/* (glob)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment