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