Mercurial > evolve

comparison tests/test-evolve-obshistory-lots-of-splits.t @ 4712:e2c548cc83b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b58e45aa9be2
children ff452675566c f16274729530
comparison
equal deleted inserted replaced
4711:88c8ef4d703c 4712:e2c548cc83b5
61 adding b 61 adding b
62 adding c 62 adding c
63 adding d 63 adding d
64 diff --git a/a b/a 64 diff --git a/a b/a
65 new file mode 100644 65 new file mode 100644
66 examine changes to 'a'? [Ynesfdaq?] y 66 examine changes to 'a'?
67 (enter ? for help) [Ynesfdaq?] y
67 68
68 @@ -0,0 +1,1 @@ 69 @@ -0,0 +1,1 @@
69 +42 70 +42
70 record change 1/4 to 'a'? [Ynesfdaq?] y 71 record change 1/4 to 'a'?
72 (enter ? for help) [Ynesfdaq?] y
71 73
72 diff --git a/b b/b 74 diff --git a/b b/b
73 new file mode 100644 75 new file mode 100644
74 examine changes to 'b'? [Ynesfdaq?] n 76 examine changes to 'b'?
77 (enter ? for help) [Ynesfdaq?] n
75 78
76 diff --git a/c b/c 79 diff --git a/c b/c
77 new file mode 100644 80 new file mode 100644
78 examine changes to 'c'? [Ynesfdaq?] n 81 examine changes to 'c'?
82 (enter ? for help) [Ynesfdaq?] n
79 83
80 diff --git a/d b/d 84 diff --git a/d b/d
81 new file mode 100644 85 new file mode 100644
82 examine changes to 'd'? [Ynesfdaq?] n 86 examine changes to 'd'?
87 (enter ? for help) [Ynesfdaq?] n
83 88
84 created new head 89 created new head
85 continue splitting? [Ycdq?] y 90 continue splitting? [Ycdq?] y
86 diff --git a/b b/b 91 diff --git a/b b/b
87 new file mode 100644 92 new file mode 100644
88 examine changes to 'b'? [Ynesfdaq?] y 93 examine changes to 'b'?
94 (enter ? for help) [Ynesfdaq?] y
89 95
90 @@ -0,0 +1,1 @@ 96 @@ -0,0 +1,1 @@
91 +43 97 +43
92 record change 1/3 to 'b'? [Ynesfdaq?] y 98 record change 1/3 to 'b'?
99 (enter ? for help) [Ynesfdaq?] y
93 100
94 diff --git a/c b/c 101 diff --git a/c b/c
95 new file mode 100644 102 new file mode 100644
96 examine changes to 'c'? [Ynesfdaq?] n 103 examine changes to 'c'?
104 (enter ? for help) [Ynesfdaq?] n
97 105
98 diff --git a/d b/d 106 diff --git a/d b/d
99 new file mode 100644 107 new file mode 100644
100 examine changes to 'd'? [Ynesfdaq?] n 108 examine changes to 'd'?
109 (enter ? for help) [Ynesfdaq?] n
101 110
102 continue splitting? [Ycdq?] y 111 continue splitting? [Ycdq?] y
103 diff --git a/c b/c 112 diff --git a/c b/c
104 new file mode 100644 113 new file mode 100644
105 examine changes to 'c'? [Ynesfdaq?] y 114 examine changes to 'c'?
115 (enter ? for help) [Ynesfdaq?] y
106 116
107 @@ -0,0 +1,1 @@ 117 @@ -0,0 +1,1 @@
108 +44 118 +44
109 record change 1/2 to 'c'? [Ynesfdaq?] y 119 record change 1/2 to 'c'?
120 (enter ? for help) [Ynesfdaq?] y
110 121
111 diff --git a/d b/d 122 diff --git a/d b/d
112 new file mode 100644 123 new file mode 100644
113 examine changes to 'd'? [Ynesfdaq?] n 124 examine changes to 'd'?
125 (enter ? for help) [Ynesfdaq?] n
114 126
115 continue splitting? [Ycdq?] y 127 continue splitting? [Ycdq?] y
116 diff --git a/d b/d 128 diff --git a/d b/d
117 new file mode 100644 129 new file mode 100644
118 examine changes to 'd'? [Ynesfdaq?] y 130 examine changes to 'd'?
131 (enter ? for help) [Ynesfdaq?] y
119 132
120 @@ -0,0 +1,1 @@ 133 @@ -0,0 +1,1 @@
121 +45 134 +45
122 record this change to 'd'? [Ynesfdaq?] y 135 record this change to 'd'?
136 (enter ? for help) [Ynesfdaq?] y
123 137
124 no more change to split 138 no more change to split
125 139
126 $ hg log --hidden -G 140 $ hg log --hidden -G
127 @ changeset: 5:c7f044602e9b 141 @ changeset: 5:c7f044602e9b