Mercurial > hg
changeset 20267:5a7aeb1e68b3
transplant: add test for interactive transplant
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Mon, 02 Dec 2013 00:50:30 +0900 |
| parents | 061766323061 |
| children | 27d3f1fe42ac |
| files | tests/test-transplant.t |
| diffstat | 1 files changed, 61 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-transplant.t Mon Dec 02 00:50:30 2013 +0900 +++ b/tests/test-transplant.t Mon Dec 02 00:50:30 2013 +0900 @@ -444,6 +444,67 @@ applying a53251cdf717 4:a53251cdf717 merged at 4831f4dc831a +test interactive transplant + + $ hg --config extensions.strip= -q strip 0 + $ hg -R ../t log -G --template "{rev}:{node|short}" + @ 4:a53251cdf717 + | + o 3:722f4667af76 + | + o 2:37a1297eb21b + | + | o 1:d11e3596cc1a + |/ + o 0:17ab29e464c6 + + $ hg transplant -q --config ui.interactive=true -s ../t <<EOF + > p + > y + > n + > n + > m + > c + > EOF + 0:17ab29e464c6 + apply changeset? [ynmpcq?]: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/r1 Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,1 @@ + +r1 + apply changeset? [ynmpcq?]: 1:d11e3596cc1a + apply changeset? [ynmpcq?]: 2:37a1297eb21b + apply changeset? [ynmpcq?]: 3:722f4667af76 + apply changeset? [ynmpcq?]: 4:a53251cdf717 + apply changeset? [ynmpcq?]: (no-eol) + $ hg log -G --template "{node|short}" + @ 88be5dde5260 + |\ + | o 722f4667af76 + | | + | o 37a1297eb21b + |/ + o 17ab29e464c6 + + $ hg transplant -q --config ui.interactive=true -s ../t <<EOF + > x + > ? + > y + > q + > EOF + 1:d11e3596cc1a + apply changeset? [ynmpcq?]: no such option + apply changeset? [ynmpcq?]: y: transplant this changeset + n: skip this changeset + m: merge at this changeset + p: show patch + c: commit selected changesets + q: cancel transplant + ?: show this help + apply changeset? [ynmpcq?]: 4:a53251cdf717 + apply changeset? [ynmpcq?]: (no-eol) + $ hg heads --template "{node|short}\n" + 88be5dde5260 + $ cd ..