##// END OF EJS Templates
transplant: add test for interactive transplant
FUJIWARA Katsunori -
r20267:5a7aeb1e default
parent child Browse files
Show More
@@ -444,6 +444,67 b' test "--merge" causing pull from source '
444 applying a53251cdf717
444 applying a53251cdf717
445 4:a53251cdf717 merged at 4831f4dc831a
445 4:a53251cdf717 merged at 4831f4dc831a
446
446
447 test interactive transplant
448
449 $ hg --config extensions.strip= -q strip 0
450 $ hg -R ../t log -G --template "{rev}:{node|short}"
451 @ 4:a53251cdf717
452 |
453 o 3:722f4667af76
454 |
455 o 2:37a1297eb21b
456 |
457 | o 1:d11e3596cc1a
458 |/
459 o 0:17ab29e464c6
460
461 $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
462 > p
463 > y
464 > n
465 > n
466 > m
467 > c
468 > EOF
469 0:17ab29e464c6
470 apply changeset? [ynmpcq?]: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
471 +++ b/r1 Thu Jan 01 00:00:00 1970 +0000
472 @@ -0,0 +1,1 @@
473 +r1
474 apply changeset? [ynmpcq?]: 1:d11e3596cc1a
475 apply changeset? [ynmpcq?]: 2:37a1297eb21b
476 apply changeset? [ynmpcq?]: 3:722f4667af76
477 apply changeset? [ynmpcq?]: 4:a53251cdf717
478 apply changeset? [ynmpcq?]: (no-eol)
479 $ hg log -G --template "{node|short}"
480 @ 88be5dde5260
481 |\
482 | o 722f4667af76
483 | |
484 | o 37a1297eb21b
485 |/
486 o 17ab29e464c6
487
488 $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
489 > x
490 > ?
491 > y
492 > q
493 > EOF
494 1:d11e3596cc1a
495 apply changeset? [ynmpcq?]: no such option
496 apply changeset? [ynmpcq?]: y: transplant this changeset
497 n: skip this changeset
498 m: merge at this changeset
499 p: show patch
500 c: commit selected changesets
501 q: cancel transplant
502 ?: show this help
503 apply changeset? [ynmpcq?]: 4:a53251cdf717
504 apply changeset? [ynmpcq?]: (no-eol)
505 $ hg heads --template "{node|short}\n"
506 88be5dde5260
507
447 $ cd ..
508 $ cd ..
448
509
449
510
General Comments 0
You need to be logged in to leave comments. Login now