Mercurial > evolve
comparison tests/test-evolve-wdir.t @ 6187:df8df57a3ce3 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 22 Feb 2022 18:21:24 +0300 |
parents | c5dfbbe4363d |
children | 716912541759 |
comparison
equal
deleted
inserted
replaced
6186:c915d9441654 | 6187:df8df57a3ce3 |
---|---|
147 adding X | 147 adding X |
148 adding Y | 148 adding Y |
149 adding Z | 149 adding Z |
150 diff --git a/X b/X | 150 diff --git a/X b/X |
151 new file mode 100644 | 151 new file mode 100644 |
152 examine changes to 'X'? | 152 examine changes to 'X'? [Ynesfdaq?] f |
153 (enter ? for help) [Ynesfdaq?] f | |
154 | 153 |
155 diff --git a/Y b/Y | 154 diff --git a/Y b/Y |
156 new file mode 100644 | 155 new file mode 100644 |
157 examine changes to 'Y'? | 156 examine changes to 'Y'? [Ynesfdaq?] d |
158 (enter ? for help) [Ynesfdaq?] d | |
159 | 157 |
160 created new head | 158 created new head |
161 continue splitting? [Ycdq?] y | 159 continue splitting? [Ycdq?] y |
162 diff --git a/Y b/Y | 160 diff --git a/Y b/Y |
163 new file mode 100644 | 161 new file mode 100644 |
164 examine changes to 'Y'? | 162 examine changes to 'Y'? [Ynesfdaq?] f |
165 (enter ? for help) [Ynesfdaq?] f | |
166 | 163 |
167 diff --git a/Z b/Z | 164 diff --git a/Z b/Z |
168 new file mode 100644 | 165 new file mode 100644 |
169 examine changes to 'Z'? | 166 examine changes to 'Z'? [Ynesfdaq?] d |
170 (enter ? for help) [Ynesfdaq?] d | |
171 | 167 |
172 continue splitting? [Ycdq?] c | 168 continue splitting? [Ycdq?] c |
173 | 169 |
174 $ hg up -r 'min(desc(c_XYZ))' --hidden | 170 $ hg up -r 'min(desc(c_XYZ))' --hidden |
175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 171 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |