Show More
@@ -204,12 +204,16 b' Set up a rebase situation for issue5581.' | |||
|
204 | 204 | $ hg commit -m c4 |
|
205 | 205 | created new head |
|
206 | 206 | |
|
207 | Configure a merge tool that runs status in the middle of the rebase. | |
|
207 | Configure a merge tool that runs status in the middle of the rebase. The goal of | |
|
208 | the status call is to trigger a potential bug if fsmonitor's state is written | |
|
209 | even though the wlock is held by another process. The output of 'hg status' in | |
|
210 | the merge tool goes to /dev/null because we're more interested in the results of | |
|
211 | 'hg status' run after the rebase. | |
|
208 | 212 | |
|
209 | 213 | $ cat >> $TESTTMP/mergetool-race.sh << EOF |
|
210 | 214 | > echo "custom merge tool" |
|
211 | 215 | > printf "c2\nc3\nc4\n" > \$1 |
|
212 | > hg --cwd "$TESTTMP/repo" status | |
|
216 | > hg --cwd "$TESTTMP/repo" status > /dev/null | |
|
213 | 217 | > echo "custom merge tool end" |
|
214 | 218 | > EOF |
|
215 | 219 | $ cat >> $HGRCPATH << EOF |
@@ -220,14 +224,10 b' Configure a merge tool that runs status ' | |||
|
220 | 224 | > test.args=$TESTTMP/mergetool-race.sh \$output |
|
221 | 225 | > EOF |
|
222 | 226 | |
|
223 | BROKEN: the "M b" line should not be there | |
|
224 | 227 | $ hg rebase -s . -d 3 --tool test |
|
225 | 228 | rebasing 4:b08445fd6b2a "c4" (tip) |
|
226 | 229 | merging a |
|
227 | 230 | custom merge tool |
|
228 | M a | |
|
229 | M b | |
|
230 | ? a.orig | |
|
231 | 231 | custom merge tool end |
|
232 | 232 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/* (glob) |
|
233 | 233 |
General Comments 0
You need to be logged in to leave comments.
Login now