Mercurial > evolve
diff tests/test-split.t @ 4294:8974a05a49fa
split: rework the prompt to be more standard
We dropped the initial capital and moved to a positive question.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 12 Dec 2018 17:22:58 +0100 |
parents | d4902d48d095 |
children | a98fa6c0d4f3 |
line wrap: on
line diff
--- a/tests/test-split.t Tue Feb 20 09:35:16 2018 +0100 +++ b/tests/test-split.t Wed Dec 12 17:22:58 2018 +0100 @@ -55,7 +55,7 @@ > y > y > n - > N + > Y > y > y > EOF @@ -79,7 +79,7 @@ record change 2/2 to '_d'? [Ynesfdaq?] n created new head - Done splitting? [yNdq?] N + continue splitting? [Ycdq?] Y diff --git a/_d b/_d new file mode 100644 examine changes to '_d'? [Ynesfdaq?] y @@ -179,7 +179,7 @@ > y > y > n - > y + > c > EOF 2 files updated, 0 files merged, 2 files removed, 0 files unresolved reverting _b @@ -201,7 +201,7 @@ record change 2/2 to '_c'? [Ynesfdaq?] n created new head - Done splitting? [yNdq?] y + continue splitting? [Ycdq?] c 2 new orphan changesets Stop before splitting the commit completely creates a commit with all the @@ -281,7 +281,7 @@ > y > y > n - > y + > c > EOF (leaving bookmark bookB) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -302,7 +302,7 @@ examine changes to '_d'? [Ynesfdaq?] n created new head - Done splitting? [yNdq?] y + continue splitting? [Ycdq?] c $ hg log -G -r "3f134f739075::" @ changeset: 16:452a26648478 | bookmark: bookA @@ -435,7 +435,7 @@ > Y > Y > N - > Y + > c > Y > Y > EOF @@ -454,16 +454,7 @@ new file mode 100644 examine changes to 'celeste'? [Ynesfdaq?] N - Done splitting? [yNdq?] Y - diff --git a/celeste b/celeste - new file mode 100644 - examine changes to 'celeste'? [Ynesfdaq?] Y - - @@ -0,0 +1,1 @@ - +celeste - record this change to 'celeste'? [Ynesfdaq?] Y - - no more change to split + continue splitting? [Ycdq?] c Check that the topic is still here @@ -537,7 +528,7 @@ $ hg split -r . << EOF > Y > N - > N + > Y > Y > EOF 0 files updated, 0 files merged, 2 files removed, 0 files unresolved @@ -551,7 +542,7 @@ new file mode 100644 examine changes to 'SPLIT2'? [Ynesfdaq?] N - Done splitting? [yNdq?] N + continue splitting? [Ycdq?] Y diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 examine changes to 'SPLIT2'? [Ynesfdaq?] Y @@ -687,13 +678,13 @@ ? - ? (display help) examine changes to 'SPLIT4'? [Ynesfdaq?] d - Done splitting? [yNdq?] ? - y - yes, commit all remaining changes - n - no, continue selection + continue splitting? [Ycdq?] ? + y - yes, continue selection + c - commit, select all remaining changes d - discard, discard remaining changes q - quit, abort the split ? - ?, display help - Done splitting? [yNdq?] q + continue splitting? [Ycdq?] q transaction abort! rollback completed abort: user quit @@ -754,7 +745,7 @@ new file mode 100644 examine changes to 'SPLIT3'? [Ynesfdaq?] d - Done splitting? [yNdq?] d + continue splitting? [Ycdq?] d discarding remaining changes forgetting SPLIT3 $ hg export