Mercurial > evolve
comparison tests/test-evolve-orphan-split.t @ 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 | bcd52ce0916d |
| children | ff452675566c 143ac9ac77a3 |
comparison
equal
deleted
inserted
replaced
| 4711:88c8ef4d703c | 4712:e2c548cc83b5 |
|---|---|
| 46 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 46 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 47 adding a | 47 adding a |
| 48 adding b | 48 adding b |
| 49 diff --git a/a b/a | 49 diff --git a/a b/a |
| 50 new file mode 100644 | 50 new file mode 100644 |
| 51 examine changes to 'a'? [Ynesfdaq?] y | 51 examine changes to 'a'? |
| 52 | 52 (enter ? for help) [Ynesfdaq?] y |
| 53 @@ -0,0 +1,1 @@ | 53 |
| 54 +foo | 54 @@ -0,0 +1,1 @@ |
| 55 record change 1/2 to 'a'? [Ynesfdaq?] y | 55 +foo |
| 56 record change 1/2 to 'a'? | |
| 57 (enter ? for help) [Ynesfdaq?] y | |
| 56 | 58 |
| 57 diff --git a/b b/b | 59 diff --git a/b b/b |
| 58 new file mode 100644 | 60 new file mode 100644 |
| 59 examine changes to 'b'? [Ynesfdaq?] n | 61 examine changes to 'b'? |
| 62 (enter ? for help) [Ynesfdaq?] n | |
| 60 | 63 |
| 61 created new head | 64 created new head |
| 62 continue splitting? [Ycdq?] c | 65 continue splitting? [Ycdq?] c |
| 63 1 new orphan changesets | 66 1 new orphan changesets |
| 64 | 67 |
| 127 adding a | 130 adding a |
| 128 adding b | 131 adding b |
| 129 adding c | 132 adding c |
| 130 diff --git a/a b/a | 133 diff --git a/a b/a |
| 131 new file mode 100644 | 134 new file mode 100644 |
| 132 examine changes to 'a'? [Ynesfdaq?] y | 135 examine changes to 'a'? |
| 133 | 136 (enter ? for help) [Ynesfdaq?] y |
| 134 @@ -0,0 +1,1 @@ | 137 |
| 135 +foo | 138 @@ -0,0 +1,1 @@ |
| 136 record change 1/3 to 'a'? [Ynesfdaq?] n | 139 +foo |
| 140 record change 1/3 to 'a'? | |
| 141 (enter ? for help) [Ynesfdaq?] n | |
| 137 | 142 |
| 138 diff --git a/b b/b | 143 diff --git a/b b/b |
| 139 new file mode 100644 | 144 new file mode 100644 |
| 140 examine changes to 'b'? [Ynesfdaq?] y | 145 examine changes to 'b'? |
| 141 | 146 (enter ? for help) [Ynesfdaq?] y |
| 142 @@ -0,0 +1,1 @@ | 147 |
| 143 +foo | 148 @@ -0,0 +1,1 @@ |
| 144 record change 2/3 to 'b'? [Ynesfdaq?] y | 149 +foo |
| 150 record change 2/3 to 'b'? | |
| 151 (enter ? for help) [Ynesfdaq?] y | |
| 145 | 152 |
| 146 diff --git a/c b/c | 153 diff --git a/c b/c |
| 147 new file mode 100644 | 154 new file mode 100644 |
| 148 examine changes to 'c'? [Ynesfdaq?] y | 155 examine changes to 'c'? |
| 149 | 156 (enter ? for help) [Ynesfdaq?] y |
| 150 @@ -0,0 +1,1 @@ | 157 |
| 151 +foo | 158 @@ -0,0 +1,1 @@ |
| 152 record change 3/3 to 'c'? [Ynesfdaq?] y | 159 +foo |
| 160 record change 3/3 to 'c'? | |
| 161 (enter ? for help) [Ynesfdaq?] y | |
| 153 | 162 |
| 154 created new head | 163 created new head |
| 155 continue splitting? [Ycdq?] c | 164 continue splitting? [Ycdq?] c |
| 156 1 new orphan changesets | 165 1 new orphan changesets |
| 157 | 166 |