Mercurial > evolve
changeset 4712:e2c548cc83b5
tests: update output for shorted prompts from Mercurial
This makes tests pass again after Mercurial commits f802a75da585 (patch: use a
short, fixed-size message for last line of prompt (issue6158), 2019-06-20).
CORE-TEST-OUTPUT-UPDATE: f802a75da585
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 09 Jul 2019 21:49:37 -0700 |
| parents | 88c8ef4d703c |
| children | fbe7f35a6926 |
| files | tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory-lots-of-splits.t tests/test-evolve-obshistory-split.t tests/test-evolve-orphan-split.t tests/test-evolve-templates.t tests/test-prev-next.t tests/test-rewind.t tests/test-split.t tests/test-topic-stack-complex.t tests/test-topic-stack.t tests/test-uncommit-interactive.t |
| diffstat | 11 files changed, 276 insertions(+), 138 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-complex.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-evolve-obshistory-complex.t Tue Jul 09 21:49:37 2019 -0700 @@ -153,25 +153,30 @@ adding B diff --git a/A b/A new file mode 100644 - examine changes to 'A'? [Ynesfdaq?] Y + examine changes to 'A'? + (enter ? for help) [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +A - record change 1/2 to 'A'? [Ynesfdaq?] Y + record change 1/2 to 'A'? + (enter ? for help) [Ynesfdaq?] Y diff --git a/B b/B new file mode 100644 - examine changes to 'B'? [Ynesfdaq?] N + examine changes to 'B'? + (enter ? for help) [Ynesfdaq?] N created new head continue splitting? [Ycdq?] Y diff --git a/B b/B new file mode 100644 - examine changes to 'B'? [Ynesfdaq?] Y + examine changes to 'B'? + (enter ? for help) [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +B - record this change to 'B'? [Ynesfdaq?] Y + record this change to 'B'? + (enter ? for help) [Ynesfdaq?] Y no more change to split $ hg split --rev "desc(fold1)" -d "0 0" << EOF @@ -187,25 +192,30 @@ adding D diff --git a/C b/C new file mode 100644 - examine changes to 'C'? [Ynesfdaq?] Y + examine changes to 'C'? + (enter ? for help) [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +C - record change 1/2 to 'C'? [Ynesfdaq?] Y + record change 1/2 to 'C'? + (enter ? for help) [Ynesfdaq?] Y diff --git a/D b/D new file mode 100644 - examine changes to 'D'? [Ynesfdaq?] N + examine changes to 'D'? + (enter ? for help) [Ynesfdaq?] N created new head continue splitting? [Ycdq?] Y diff --git a/D b/D new file mode 100644 - examine changes to 'D'? [Ynesfdaq?] Y + examine changes to 'D'? + (enter ? for help) [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +D - record this change to 'D'? [Ynesfdaq?] Y + record this change to 'D'? + (enter ? for help) [Ynesfdaq?] Y no more change to split 1 new orphan changesets @@ -222,25 +232,30 @@ adding F diff --git a/E b/E new file mode 100644 - examine changes to 'E'? [Ynesfdaq?] Y + examine changes to 'E'? + (enter ? for help) [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +E - record change 1/2 to 'E'? [Ynesfdaq?] Y + record change 1/2 to 'E'? + (enter ? for help) [Ynesfdaq?] Y diff --git a/F b/F new file mode 100644 - examine changes to 'F'? [Ynesfdaq?] N + examine changes to 'F'? + (enter ? for help) [Ynesfdaq?] N created new head continue splitting? [Ycdq?] Y diff --git a/F b/F new file mode 100644 - examine changes to 'F'? [Ynesfdaq?] Y + examine changes to 'F'? + (enter ? for help) [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +F - record this change to 'F'? [Ynesfdaq?] Y + record this change to 'F'? + (enter ? for help) [Ynesfdaq?] Y no more change to split 1 new orphan changesets
--- a/tests/test-evolve-obshistory-lots-of-splits.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Tue Jul 09 21:49:37 2019 -0700 @@ -63,63 +63,77 @@ adding d diff --git a/a b/a new file mode 100644 - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +42 - record change 1/4 to 'a'? [Ynesfdaq?] y + record change 1/4 to 'a'? + (enter ? for help) [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] n + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] n diff --git a/c b/c new file mode 100644 - examine changes to 'c'? [Ynesfdaq?] n + examine changes to 'c'? + (enter ? for help) [Ynesfdaq?] n diff --git a/d b/d new file mode 100644 - examine changes to 'd'? [Ynesfdaq?] n + examine changes to 'd'? + (enter ? for help) [Ynesfdaq?] n created new head continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] y + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +43 - record change 1/3 to 'b'? [Ynesfdaq?] y + record change 1/3 to 'b'? + (enter ? for help) [Ynesfdaq?] y diff --git a/c b/c new file mode 100644 - examine changes to 'c'? [Ynesfdaq?] n + examine changes to 'c'? + (enter ? for help) [Ynesfdaq?] n diff --git a/d b/d new file mode 100644 - examine changes to 'd'? [Ynesfdaq?] n + examine changes to 'd'? + (enter ? for help) [Ynesfdaq?] n continue splitting? [Ycdq?] y diff --git a/c b/c new file mode 100644 - examine changes to 'c'? [Ynesfdaq?] y + examine changes to 'c'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +44 - record change 1/2 to 'c'? [Ynesfdaq?] y + record change 1/2 to 'c'? + (enter ? for help) [Ynesfdaq?] y diff --git a/d b/d new file mode 100644 - examine changes to 'd'? [Ynesfdaq?] n + examine changes to 'd'? + (enter ? for help) [Ynesfdaq?] n continue splitting? [Ycdq?] y diff --git a/d b/d new file mode 100644 - examine changes to 'd'? [Ynesfdaq?] y + examine changes to 'd'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +45 - record this change to 'd'? [Ynesfdaq?] y + record this change to 'd'? + (enter ? for help) [Ynesfdaq?] y no more change to split
--- a/tests/test-evolve-obshistory-split.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-evolve-obshistory-split.t Tue Jul 09 21:49:37 2019 -0700 @@ -47,25 +47,30 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +42 - record change 1/2 to 'a'? [Ynesfdaq?] y + record change 1/2 to 'a'? + (enter ? for help) [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] n + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] n created new head continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] y + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +43 - record this change to 'b'? [Ynesfdaq?] y + record this change to 'b'? + (enter ? for help) [Ynesfdaq?] y no more change to split
--- a/tests/test-evolve-orphan-split.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-evolve-orphan-split.t Tue Jul 09 21:49:37 2019 -0700 @@ -48,15 +48,18 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo - record change 1/2 to 'a'? [Ynesfdaq?] y + record change 1/2 to 'a'? + (enter ? for help) [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] n + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] n created new head continue splitting? [Ycdq?] c @@ -129,27 +132,33 @@ adding c diff --git a/a b/a new file mode 100644 - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo - record change 1/3 to 'a'? [Ynesfdaq?] n + record change 1/3 to 'a'? + (enter ? for help) [Ynesfdaq?] n diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] y + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo - record change 2/3 to 'b'? [Ynesfdaq?] y + record change 2/3 to 'b'? + (enter ? for help) [Ynesfdaq?] y diff --git a/c b/c new file mode 100644 - examine changes to 'c'? [Ynesfdaq?] y + examine changes to 'c'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo - record change 3/3 to 'c'? [Ynesfdaq?] y + record change 3/3 to 'c'? + (enter ? for help) [Ynesfdaq?] y created new head continue splitting? [Ycdq?] c
--- a/tests/test-evolve-templates.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-evolve-templates.t Tue Jul 09 21:49:37 2019 -0700 @@ -281,25 +281,30 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +42 - record change 1/2 to 'a'? [Ynesfdaq?] y + record change 1/2 to 'a'? + (enter ? for help) [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] n + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] n created new head continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] y + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +43 - record this change to 'b'? [Ynesfdaq?] y + record this change to 'b'? + (enter ? for help) [Ynesfdaq?] y no more change to split
--- a/tests/test-prev-next.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-prev-next.t Tue Jul 09 21:49:37 2019 -0700 @@ -534,26 +534,31 @@ adding b diff --git a/a b/a 1 hunks, 1 lines changed - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,1 +1,2 @@ firstline +secondline - record change 1/2 to 'a'? [Ynesfdaq?] y + record change 1/2 to 'a'? + (enter ? for help) [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] n + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] n created new head continue splitting? [Ycdq?] Y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] y + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +bbbbb - record this change to 'b'? [Ynesfdaq?] y + record this change to 'b'? + (enter ? for help) [Ynesfdaq?] y no more change to split 1 new orphan changesets
--- a/tests/test-rewind.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-rewind.t Tue Jul 09 21:49:37 2019 -0700 @@ -467,15 +467,18 @@ adding D diff --git a/C b/C new file mode 100644 - examine changes to 'C'? [Ynesfdaq?] y + examine changes to 'C'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +C - record change 1/2 to 'C'? [Ynesfdaq?] f + record change 1/2 to 'C'? + (enter ? for help) [Ynesfdaq?] f diff --git a/D b/D new file mode 100644 - examine changes to 'D'? [Ynesfdaq?] d + examine changes to 'D'? + (enter ? for help) [Ynesfdaq?] d created new head continue splitting? [Ycdq?] c
--- a/tests/test-split.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-split.t Tue Jul 09 21:49:37 2019 -0700 @@ -68,29 +68,35 @@ adding _d diff --git a/_a b/_a 1 hunks, 1 lines changed - examine changes to '_a'? [Ynesfdaq?] y + examine changes to '_a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,0 +2,1 @@ +change to a - record change 1/2 to '_a'? [Ynesfdaq?] y + record change 1/2 to '_a'? + (enter ? for help) [Ynesfdaq?] y diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? [Ynesfdaq?] y + examine changes to '_d'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +_d - record change 2/2 to '_d'? [Ynesfdaq?] n + record change 2/2 to '_d'? + (enter ? for help) [Ynesfdaq?] n created new head continue splitting? [Ycdq?] Y diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? [Ynesfdaq?] y + examine changes to '_d'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +_d - record this change to '_d'? [Ynesfdaq?] y + record this change to '_d'? + (enter ? for help) [Ynesfdaq?] y no more change to split @@ -190,19 +196,23 @@ adding _c diff --git a/_b b/_b 1 hunks, 1 lines changed - examine changes to '_b'? [Ynesfdaq?] y + examine changes to '_b'? + (enter ? for help) [Ynesfdaq?] y @@ -1,0 +2,1 @@ +change to b - record change 1/2 to '_b'? [Ynesfdaq?] y + record change 1/2 to '_b'? + (enter ? for help) [Ynesfdaq?] y diff --git a/_c b/_c new file mode 100644 - examine changes to '_c'? [Ynesfdaq?] y + examine changes to '_c'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +_c - record change 2/2 to '_c'? [Ynesfdaq?] n + record change 2/2 to '_c'? + (enter ? for help) [Ynesfdaq?] n created new head continue splitting? [Ycdq?] c @@ -293,17 +303,20 @@ adding _d diff --git a/_a b/_a 1 hunks, 2 lines changed - examine changes to '_a'? [Ynesfdaq?] y + examine changes to '_a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,2 +1,1 @@ -_a -change to a +changetofilea - record change 1/2 to '_a'? [Ynesfdaq?] y + record change 1/2 to '_a'? + (enter ? for help) [Ynesfdaq?] y diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? [Ynesfdaq?] n + examine changes to '_d'? + (enter ? for help) [Ynesfdaq?] n created new head continue splitting? [Ycdq?] c @@ -338,7 +351,8 @@ adding _d diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? [Ynesfdaq?] abort: response expected + examine changes to '_d'? + (enter ? for help) [Ynesfdaq?] abort: response expected [255] Cannot split a commit that is not a head if instability is not allowed @@ -364,7 +378,8 @@ adding _d diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? [Ynesfdaq?] q + examine changes to '_d'? + (enter ? for help) [Ynesfdaq?] q abort: user quit [255] @@ -377,7 +392,8 @@ adding _d diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? [Ynesfdaq?] q + examine changes to '_d'? + (enter ? for help) [Ynesfdaq?] q abort: user quit [255] @@ -447,15 +463,18 @@ adding celeste diff --git a/babar b/babar new file mode 100644 - examine changes to 'babar'? [Ynesfdaq?] Y + examine changes to 'babar'? + (enter ? for help) [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +babar - record change 1/2 to 'babar'? [Ynesfdaq?] Y + record change 1/2 to 'babar'? + (enter ? for help) [Ynesfdaq?] Y diff --git a/celeste b/celeste new file mode 100644 - examine changes to 'celeste'? [Ynesfdaq?] N + examine changes to 'celeste'? + (enter ? for help) [Ynesfdaq?] N continue splitting? [Ycdq?] c @@ -539,16 +558,19 @@ adding SPLIT2 diff --git a/SPLIT1 b/SPLIT1 new file mode 100644 - examine changes to 'SPLIT1'? [Ynesfdaq?] Y + examine changes to 'SPLIT1'? + (enter ? for help) [Ynesfdaq?] Y diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - examine changes to 'SPLIT2'? [Ynesfdaq?] N + examine changes to 'SPLIT2'? + (enter ? for help) [Ynesfdaq?] N continue splitting? [Ycdq?] Y diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - examine changes to 'SPLIT2'? [Ynesfdaq?] Y + examine changes to 'SPLIT2'? + (enter ? for help) [Ynesfdaq?] Y no more change to split @@ -617,11 +639,13 @@ adding SPLIT4 diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - examine changes to 'SPLIT3'? [Ynesfdaq?] Y + examine changes to 'SPLIT3'? + (enter ? for help) [Ynesfdaq?] Y diff --git a/SPLIT4 b/SPLIT4 new file mode 100644 - examine changes to 'SPLIT4'? [Ynesfdaq?] q + examine changes to 'SPLIT4'? + (enter ? for help) [Ynesfdaq?] q abort: user quit [255] @@ -663,11 +687,13 @@ adding SPLIT4 diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - examine changes to 'SPLIT3'? [Ynesfdaq?] Y + examine changes to 'SPLIT3'? + (enter ? for help) [Ynesfdaq?] Y diff --git a/SPLIT4 b/SPLIT4 new file mode 100644 - examine changes to 'SPLIT4'? [Ynesfdaq?] ? + examine changes to 'SPLIT4'? + (enter ? for help) [Ynesfdaq?] ? y - yes, record this change n - no, skip this change @@ -678,7 +704,8 @@ a - record all changes to all remaining files q - quit, recording no changes ? - ? (display help) - examine changes to 'SPLIT4'? [Ynesfdaq?] d + examine changes to 'SPLIT4'? + (enter ? for help) [Ynesfdaq?] d continue splitting? [Ycdq?] ? y - yes, continue selection @@ -741,11 +768,13 @@ adding SPLIT3 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - examine changes to 'SPLIT2'? [Ynesfdaq?] Y + examine changes to 'SPLIT2'? + (enter ? for help) [Ynesfdaq?] Y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - examine changes to 'SPLIT3'? [Ynesfdaq?] d + examine changes to 'SPLIT3'? + (enter ? for help) [Ynesfdaq?] d continue splitting? [Ycdq?] d discarding remaining changes @@ -801,13 +830,15 @@ new file mode 100644 @@ -0,0 +1,1 @@ +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + record change 1/2 to 'SPLIT2'? + (enter ? for help) [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 + record change 2/2 to 'SPLIT3'? + (enter ? for help) [Ynesfdaq?] s continue splitting? [Ycdq?] c @@ -836,20 +867,23 @@ new file mode 100644 @@ -0,0 +1,1 @@ +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + record change 1/2 to 'SPLIT2'? + (enter ? for help) [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 + record change 2/2 to 'SPLIT3'? + (enter ? for help) [Ynesfdaq?] s 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 + record this change to 'SPLIT3'? + (enter ? for help) [Ynesfdaq?] y no more change to split @@ -877,13 +911,15 @@ new file mode 100644 @@ -0,0 +1,1 @@ +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + record change 1/2 to 'SPLIT2'? + (enter ? for help) [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 + record change 2/2 to 'SPLIT3'? + (enter ? for help) [Ynesfdaq?] y no more change to split $ hg status --change '.~1' @@ -910,13 +946,15 @@ new file mode 100644 @@ -0,0 +1,1 @@ +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + record change 1/2 to 'SPLIT2'? + (enter ? for help) [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 + record change 2/2 to 'SPLIT3'? + (enter ? for help) [Ynesfdaq?] s continue splitting? [Ycdq?] d discarding remaining changes @@ -1058,26 +1096,31 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +a - record change 1/2 to 'a'? [Ynesfdaq?] y + record change 1/2 to 'a'? + (enter ? for help) [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] n + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] n created new head (consider using topic for lightweight branches. See 'hg help topic') continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] y + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +b - record this change to 'b'? [Ynesfdaq?] y + record this change to 'b'? + (enter ? for help) [Ynesfdaq?] y no more change to split 1 new orphan changesets @@ -1200,15 +1243,18 @@ adding c diff --git a/b b/b new file mode 100644 - examine changes to 'b'? [Ynesfdaq?] y + examine changes to 'b'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +b - record change 1/2 to 'b'? [Ynesfdaq?] y + record change 1/2 to 'b'? + (enter ? for help) [Ynesfdaq?] y diff --git a/c b/c new file mode 100644 - examine changes to 'c'? [Ynesfdaq?] n + examine changes to 'c'? + (enter ? for help) [Ynesfdaq?] n created new head (consider using topic for lightweight branches. See 'hg help topic')
--- a/tests/test-topic-stack-complex.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-topic-stack-complex.t Tue Jul 09 21:49:37 2019 -0700 @@ -70,15 +70,18 @@ adding d diff --git a/c b/c new file mode 100644 - examine changes to 'c'? [Ynesfdaq?] y + examine changes to 'c'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +c - record change 1/2 to 'c'? [Ynesfdaq?] y + record change 1/2 to 'c'? + (enter ? for help) [Ynesfdaq?] y diff --git a/d b/d new file mode 100644 - examine changes to 'd'? [Ynesfdaq?] n + examine changes to 'd'? + (enter ? for help) [Ynesfdaq?] n continue splitting? [Ycdq?] c 1 new orphan changesets
--- a/tests/test-topic-stack.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-topic-stack.t Tue Jul 09 21:49:37 2019 -0700 @@ -940,15 +940,18 @@ adding ggg diff --git a/Z b/Z new file mode 100644 - examine changes to 'Z'? [Ynesfdaq?] y + examine changes to 'Z'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +zzz - record change 1/2 to 'Z'? [Ynesfdaq?] y + record change 1/2 to 'Z'? + (enter ? for help) [Ynesfdaq?] y diff --git a/ggg b/ggg new file mode 100644 - examine changes to 'ggg'? [Ynesfdaq?] n + examine changes to 'ggg'? + (enter ? for help) [Ynesfdaq?] n continue splitting? [Ycdq?] c
--- a/tests/test-uncommit-interactive.t Thu Jul 11 10:07:39 2019 +0200 +++ b/tests/test-uncommit-interactive.t Tue Jul 09 21:49:37 2019 -0700 @@ -41,7 +41,8 @@ > EOF diff --git a/a b/a new file mode 100644 - examine changes to 'a'? [Ynesfdaq?] q + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] q abort: user quit [255] @@ -94,7 +95,8 @@ > EOF diff --git a/a b/a 3 hunks, 6 lines changed - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,3 +1,6 @@ +-2 @@ -103,7 +105,8 @@ 1 2 3 - discard change 1/3 to 'a'? [Ynesfdaq?] n + discard change 1/3 to 'a'? + (enter ? for help) [Ynesfdaq?] n @@ -1,5 +4,7 @@ 1 @@ -113,13 +116,15 @@ +bar 4 5 - discard change 2/3 to 'a'? [Ynesfdaq?] n + discard change 2/3 to 'a'? + (enter ? for help) [Ynesfdaq?] n @@ -4,2 +9,3 @@ 4 5 +babar - discard change 3/3 to 'a'? [Ynesfdaq?] n + discard change 3/3 to 'a'? + (enter ? for help) [Ynesfdaq?] n abort: nothing selected to uncommit [255] @@ -136,7 +141,8 @@ > EOF diff --git a/a b/a 3 hunks, 6 lines changed - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,3 +1,6 @@ +-2 @@ -145,7 +151,8 @@ 1 2 3 - discard change 1/3 to 'a'? [Ynesfdaq?] y + discard change 1/3 to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,5 +4,7 @@ 1 @@ -155,13 +162,15 @@ +bar 4 5 - discard change 2/3 to 'a'? [Ynesfdaq?] n + discard change 2/3 to 'a'? + (enter ? for help) [Ynesfdaq?] n @@ -4,2 +9,3 @@ 4 5 +babar - discard change 3/3 to 'a'? [Ynesfdaq?] n + discard change 3/3 to 'a'? + (enter ? for help) [Ynesfdaq?] n $ hg obslog @@ -235,7 +244,8 @@ > EOF diff --git a/a b/a 2 hunks, 3 lines changed - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,5 +1,7 @@ 1 @@ -245,13 +255,15 @@ +bar 4 5 - discard change 1/2 to 'a'? [Ynesfdaq?] n + discard change 1/2 to 'a'? + (enter ? for help) [Ynesfdaq?] n @@ -4,2 +6,3 @@ 4 5 +babar - discard change 2/2 to 'a'? [Ynesfdaq?] y + discard change 2/2 to 'a'? + (enter ? for help) [Ynesfdaq?] y patching file a Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). @@ -330,11 +342,13 @@ > EOF diff --git a/foo b/foo new file mode 100644 - examine changes to 'foo'? [Ynesfdaq?] y + examine changes to 'foo'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +hey - discard this change to 'foo'? [Ynesfdaq?] y + discard this change to 'foo'? + (enter ? for help) [Ynesfdaq?] y new changeset is empty (use 'hg prune .' to remove it) @@ -397,7 +411,8 @@ > EOF diff --git a/a b/a deleted file mode 100644 - examine changes to 'a'? [Ynesfdaq?] n + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] n abort: nothing selected to uncommit [255] @@ -414,7 +429,8 @@ > EOF diff --git a/a b/a deleted file mode 100644 - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y new changeset is empty (use 'hg prune .' to remove it) @@ -478,20 +494,24 @@ > EOF diff --git a/foo b/foo 1 hunks, 1 lines changed - examine changes to 'foo'? [Ynesfdaq?] y + examine changes to 'foo'? + (enter ? for help) [Ynesfdaq?] y @@ -1,1 +1,2 @@ hey +foo - discard change 1/2 to 'foo'? [Ynesfdaq?] y + discard change 1/2 to 'foo'? + (enter ? for help) [Ynesfdaq?] y diff --git a/x b/x new file mode 100644 - examine changes to 'x'? [Ynesfdaq?] y + examine changes to 'x'? + (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +abcd - discard change 2/2 to 'x'? [Ynesfdaq?] n + discard change 2/2 to 'x'? + (enter ? for help) [Ynesfdaq?] n $ hg exp @@ -578,7 +598,8 @@ > EOF diff --git a/a b/a 3 hunks, 6 lines changed - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,3 +1,6 @@ +-2 @@ -587,7 +608,8 @@ 1 2 3 - discard change 1/3 to 'a'? [Ynesfdaq?] n + discard change 1/3 to 'a'? + (enter ? for help) [Ynesfdaq?] n @@ -1,5 +4,7 @@ 1 @@ -597,13 +619,15 @@ +bar 4 5 - discard change 2/3 to 'a'? [Ynesfdaq?] n + discard change 2/3 to 'a'? + (enter ? for help) [Ynesfdaq?] n @@ -4,2 +9,3 @@ 4 5 +babar - discard change 3/3 to 'a'? [Ynesfdaq?] y + discard change 3/3 to 'a'? + (enter ? for help) [Ynesfdaq?] y patching file a Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). @@ -662,7 +686,8 @@ > EOF diff --git a/a b/a 2 hunks, 5 lines changed - examine changes to 'a'? [Ynesfdaq?] y + examine changes to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,3 +1,6 @@ +-2 @@ -671,7 +696,8 @@ 1 2 3 - discard change 1/2 to 'a'? [Ynesfdaq?] y + discard change 1/2 to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -1,5 +4,7 @@ 1 @@ -681,7 +707,8 @@ +bar 4 5 - discard change 2/2 to 'a'? [Ynesfdaq?] n + discard change 2/2 to 'a'? + (enter ? for help) [Ynesfdaq?] n $ hg exp @@ -788,7 +815,8 @@ 5 babar +celeste - discard this change to 'a'? [Ynesfdaq?] y + discard this change to 'a'? + (enter ? for help) [Ynesfdaq?] y $ hg status M a @@ -852,14 +880,16 @@ -2 -1 0 - discard change 1/2 to 'a'? [Ynesfdaq?] y + discard change 1/2 to 'a'? + (enter ? for help) [Ynesfdaq?] y @@ -9,3 +10,4 @@ 4 5 babar +celeste - discard change 2/2 to 'a'? [Ynesfdaq?] n + discard change 2/2 to 'a'? + (enter ? for help) [Ynesfdaq?] n $ hg status M a