444 applying ../patch2 |
444 applying ../patch2 |
445 $ hg --cwd b update -q 1 |
445 $ hg --cwd b update -q 1 |
446 $ hg --cwd b rollback -q |
446 $ hg --cwd b rollback -q |
447 $ hg --cwd b parents --template 'parent: {rev}\n' |
447 $ hg --cwd b parents --template 'parent: {rev}\n' |
448 parent: 1 |
448 parent: 1 |
|
449 |
|
450 $ hg --cwd b update -q -C 0 |
|
451 $ hg --cwd b --config extensions.strip= strip -q 1 |
|
452 |
|
453 Test visibility of in-memory distate changes inside transaction to |
|
454 external process |
|
455 |
|
456 $ echo foo > a/foo |
|
457 $ hg --cwd a commit -A -m 'adding foo' foo |
|
458 $ hg --cwd a export -o '../patch%R' 3 |
|
459 |
|
460 $ cat > $TESTTMP/checkvisibility.sh <<EOF |
|
461 > echo "====" |
|
462 > hg parents --template "VISIBLE {rev}:{node|short}\n" |
|
463 > hg status -amr |
|
464 > # test that pending changes are hidden |
|
465 > unset HG_PENDING |
|
466 > hg parents --template "ACTUAL {rev}:{node|short}\n" |
|
467 > hg status -amr |
|
468 > echo "====" |
|
469 > EOF |
|
470 |
|
471 == test visibility to external editor |
|
472 |
|
473 $ (cd b && sh "$TESTTMP/checkvisibility.sh") |
|
474 ==== |
|
475 VISIBLE 0:80971e65b431 |
|
476 ACTUAL 0:80971e65b431 |
|
477 ==== |
|
478 |
|
479 $ HGEDITOR="sh $TESTTMP/checkvisibility.sh" hg --cwd b import -v --edit ../patch1 ../patch2 ../patch3 |
|
480 applying ../patch1 |
|
481 patching file a |
|
482 ==== |
|
483 VISIBLE 0:80971e65b431 |
|
484 M a |
|
485 ACTUAL 0:80971e65b431 |
|
486 M a |
|
487 ==== |
|
488 committing files: |
|
489 a |
|
490 committing manifest |
|
491 committing changelog |
|
492 created 1d4bd90af0e4 |
|
493 applying ../patch2 |
|
494 patching file a |
|
495 ==== |
|
496 VISIBLE 1:1d4bd90af0e4 |
|
497 M a |
|
498 ACTUAL 0:80971e65b431 |
|
499 M a |
|
500 ==== |
|
501 committing files: |
|
502 a |
|
503 committing manifest |
|
504 committing changelog |
|
505 created 6d019af21222 |
|
506 applying ../patch3 |
|
507 patching file foo |
|
508 adding foo |
|
509 ==== |
|
510 VISIBLE 2:6d019af21222 |
|
511 A foo |
|
512 ACTUAL 0:80971e65b431 |
|
513 M a |
|
514 ==== |
|
515 committing files: |
|
516 foo |
|
517 committing manifest |
|
518 committing changelog |
|
519 created 55e3f75b2378 |
|
520 |
|
521 $ hg --cwd b rollback -q |
|
522 |
|
523 (content of file "a" is already changed and it should be recognized as |
|
524 "M", even though dirstate is restored to one before "hg import") |
|
525 |
|
526 $ (cd b && sh "$TESTTMP/checkvisibility.sh") |
|
527 ==== |
|
528 VISIBLE 0:80971e65b431 |
|
529 M a |
|
530 ACTUAL 0:80971e65b431 |
|
531 M a |
|
532 ==== |
|
533 $ hg --cwd b revert --no-backup a |
|
534 $ rm -f b/foo |
449 |
535 |
450 $ rm -r b |
536 $ rm -r b |
451 |
537 |
452 |
538 |
453 importing a patch in a subdirectory failed at the commit stage |
539 importing a patch in a subdirectory failed at the commit stage |