Mercurial > evolve
changeset 4502:84512556e148 stable
test: revert update from 5.0 record logic
This revert the test changes from 90f94231db5d.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 21:09:31 +0200 |
| parents | 90f94231db5d |
| children | fce8f5ca10d8 |
| files | tests/test-split.t tests/test-uncommit-interactive.t |
| diffstat | 2 files changed, 18 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-split.t Wed Apr 10 23:19:29 2019 +0530 +++ b/tests/test-split.t Thu Apr 11 21:09:31 2019 +0200 @@ -779,18 +779,9 @@ (remaining changes gathered with unmatched one) -adding content in files to make sure that it prompt us to select the changes, -as it won't prompt if a file has no changes at hunk level and passed in cli -(for more look into hg db72f9f6580e which made it to not prompt "examine changes to fileX" -for files which are explicitly mentioned by user) - $ echo sp2 > SPLIT2 - $ echo sp3 > SPLIT3 - $ echo sp4 > SPLIT4 - $ hg amend - $ hg split SPLIT2 SPLIT3 << EOF > y - > s + > n > c > EOF 0 files updated, 0 files merged, 3 files removed, 0 files unresolved @@ -799,18 +790,13 @@ adding SPLIT4 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + examine changes to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s + examine changes to 'SPLIT3'? [Ynesfdaq?] n continue splitting? [Ycdq?] c - $ hg status --change '.~1' A SPLIT2 $ hg status --change '.' @@ -824,7 +810,7 @@ $ hg split SPLIT2 SPLIT3 << EOF > y - > s + > n > y > y > EOF @@ -834,25 +820,18 @@ adding SPLIT4 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + examine changes to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s + examine changes to 'SPLIT3'? [Ynesfdaq?] n continue splitting? [Ycdq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record this change to 'SPLIT3'? [Ynesfdaq?] y + examine changes to 'SPLIT3'? [Ynesfdaq?] y no more change to split - $ hg status --change '.~2' A SPLIT2 $ hg status --change '.~1' @@ -875,15 +854,11 @@ adding SPLIT4 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + examine changes to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y + examine changes to 'SPLIT3'? [Ynesfdaq?] y no more change to split $ hg status --change '.~1' @@ -899,7 +874,7 @@ $ hg split SPLIT2 SPLIT3 << EOF > y - > s + > n > d > EOF 0 files updated, 0 files merged, 3 files removed, 0 files unresolved @@ -908,15 +883,11 @@ adding SPLIT4 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + examine changes to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s + examine changes to 'SPLIT3'? [Ynesfdaq?] n continue splitting? [Ycdq?] d discarding remaining changes
--- a/tests/test-uncommit-interactive.t Wed Apr 10 23:19:29 2019 +0530 +++ b/tests/test-uncommit-interactive.t Thu Apr 11 21:09:31 2019 +0200 @@ -780,9 +780,12 @@ $ hg uncommit -i a << DONE > y + > y > DONE diff --git a/a b/a 1 hunks, 1 lines changed + examine changes to 'a'? [Ynesfdaq?] y + @@ -9,3 +9,4 @@ 4 5 @@ -843,10 +846,13 @@ $ hg uncommit -i a << DONE > y + > y > n > DONE diff --git a/a b/a 2 hunks, 2 lines changed + examine changes to 'a'? [Ynesfdaq?] y + @@ -1,3 +1,4 @@ +-3 -2