equal
deleted
inserted
replaced
194 ? p |
194 ? p |
195 ? q |
195 ? q |
196 $ cat $TESTTMP/status-race-lock.log |
196 $ cat $TESTTMP/status-race-lock.log |
197 #else |
197 #else |
198 $ cat $TESTTMP/status-race-lock.out |
198 $ cat $TESTTMP/status-race-lock.out |
199 $ cat $TESTTMP/status-race-lock.log |
199 A dir/n |
200 abort: dirstate-v2 parse error: not enough bytes on disk |
200 A dir/o |
|
201 R dir/nested/m |
|
202 ? p |
|
203 ? q |
|
204 $ cat $TESTTMP/status-race-lock.log |
201 #endif |
205 #endif |
202 #endif |
206 #endif |
203 #else |
207 #else |
204 #if rust |
208 #if rust |
205 #if dirstate-v2-rewrite |
209 #if dirstate-v2-rewrite |
303 ? p |
307 ? p |
304 ? q |
308 ? q |
305 $ cat $TESTTMP/status-race-lock.log |
309 $ cat $TESTTMP/status-race-lock.log |
306 #else |
310 #else |
307 $ cat $TESTTMP/status-race-lock.out |
311 $ cat $TESTTMP/status-race-lock.out |
308 $ cat $TESTTMP/status-race-lock.log |
312 ? dir/n |
309 abort: dirstate-v2 parse error: not enough bytes on disk |
313 ? p |
|
314 ? q |
|
315 $ cat $TESTTMP/status-race-lock.log |
310 #endif |
316 #endif |
311 #endif |
317 #endif |
312 #else |
318 #else |
313 #if rust |
319 #if rust |
314 #if dirstate-v2-rewrite |
320 #if dirstate-v2-rewrite |
439 ? p |
445 ? p |
440 ? q |
446 ? q |
441 $ cat $TESTTMP/status-race-lock.log |
447 $ cat $TESTTMP/status-race-lock.log |
442 #else |
448 #else |
443 $ cat $TESTTMP/status-race-lock.out |
449 $ cat $TESTTMP/status-race-lock.out |
444 $ cat $TESTTMP/status-race-lock.log |
450 A dir/o |
445 abort: dirstate-v2 parse error: not enough bytes on disk |
451 ? dir/n |
|
452 ? p |
|
453 ? q |
|
454 $ cat $TESTTMP/status-race-lock.log |
446 #endif |
455 #endif |
447 #endif |
456 #endif |
448 #else |
457 #else |
449 #if rust |
458 #if rust |
450 #if dirstate-v2-rewrite |
459 #if dirstate-v2-rewrite |
541 ? p |
550 ? p |
542 ? q |
551 ? q |
543 $ cat $TESTTMP/status-race-lock.log |
552 $ cat $TESTTMP/status-race-lock.log |
544 #else |
553 #else |
545 $ cat $TESTTMP/status-race-lock.out |
554 $ cat $TESTTMP/status-race-lock.out |
546 $ cat $TESTTMP/status-race-lock.log |
555 A dir/o |
547 abort: dirstate-v2 parse error: not enough bytes on disk |
556 R dir/nested/m |
|
557 ? dir/n |
|
558 ? p |
|
559 ? q |
|
560 $ cat $TESTTMP/status-race-lock.log |
548 #endif |
561 #endif |
549 #endif |
562 #endif |
550 #else |
563 #else |
551 #if rust |
564 #if rust |
552 #if dirstate-v2-rewrite |
565 #if dirstate-v2-rewrite |