Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- 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