Mercurial > evolve

comparison tests/test-evolve-obshistory-complex.t @ 5159:e5fe3ca5e6ad mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 28 Feb 2020 23:18:48 +0700
parents ff452675566c 900668a93629
children a7fb433faab6 e6e92835d42d
comparison
equal deleted inserted replaced
5158:8d20c0af010a 5159:e5fe3ca5e6ad
151 0 files updated, 0 files merged, 6 files removed, 0 files unresolved 151 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
152 adding A 152 adding A
153 adding B 153 adding B
154 diff --git a/A b/A 154 diff --git a/A b/A
155 new file mode 100644 155 new file mode 100644
156 examine changes to 'A'? 156 examine changes to 'A'? [Ynesfdaq?] Y
157 (enter ? for help) [Ynesfdaq?] Y
158 157
159 @@ -0,0 +1,1 @@ 158 @@ -0,0 +1,1 @@
160 +A 159 +A
161 record change 1/2 to 'A'? 160 record change 1/2 to 'A'? [Ynesfdaq?] Y
162 (enter ? for help) [Ynesfdaq?] Y
163 161
164 diff --git a/B b/B 162 diff --git a/B b/B
165 new file mode 100644 163 new file mode 100644
166 examine changes to 'B'? 164 examine changes to 'B'? [Ynesfdaq?] N
167 (enter ? for help) [Ynesfdaq?] N
168 165
169 created new head 166 created new head
170 continue splitting? [Ycdq?] Y 167 continue splitting? [Ycdq?] Y
171 diff --git a/B b/B 168 diff --git a/B b/B
172 new file mode 100644 169 new file mode 100644
173 examine changes to 'B'? 170 examine changes to 'B'? [Ynesfdaq?] Y
174 (enter ? for help) [Ynesfdaq?] Y
175 171
176 @@ -0,0 +1,1 @@ 172 @@ -0,0 +1,1 @@
177 +B 173 +B
178 record this change to 'B'? 174 record this change to 'B'? [Ynesfdaq?] Y
179 (enter ? for help) [Ynesfdaq?] Y
180 175
181 no more change to split 176 no more change to split
182 $ hg split --rev "desc(fold1)" -d "0 0" << EOF 177 $ hg split --rev "desc(fold1)" -d "0 0" << EOF
183 > Y 178 > Y
184 > Y 179 > Y
190 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 185 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
191 adding C 186 adding C
192 adding D 187 adding D
193 diff --git a/C b/C 188 diff --git a/C b/C
194 new file mode 100644 189 new file mode 100644
195 examine changes to 'C'? 190 examine changes to 'C'? [Ynesfdaq?] Y
196 (enter ? for help) [Ynesfdaq?] Y
197 191
198 @@ -0,0 +1,1 @@ 192 @@ -0,0 +1,1 @@
199 +C 193 +C
200 record change 1/2 to 'C'? 194 record change 1/2 to 'C'? [Ynesfdaq?] Y
201 (enter ? for help) [Ynesfdaq?] Y
202 195
203 diff --git a/D b/D 196 diff --git a/D b/D
204 new file mode 100644 197 new file mode 100644
205 examine changes to 'D'? 198 examine changes to 'D'? [Ynesfdaq?] N
206 (enter ? for help) [Ynesfdaq?] N
207 199
208 created new head 200 created new head
209 continue splitting? [Ycdq?] Y 201 continue splitting? [Ycdq?] Y
210 diff --git a/D b/D 202 diff --git a/D b/D
211 new file mode 100644 203 new file mode 100644
212 examine changes to 'D'? 204 examine changes to 'D'? [Ynesfdaq?] Y
213 (enter ? for help) [Ynesfdaq?] Y
214 205
215 @@ -0,0 +1,1 @@ 206 @@ -0,0 +1,1 @@
216 +D 207 +D
217 record this change to 'D'? 208 record this change to 'D'? [Ynesfdaq?] Y
218 (enter ? for help) [Ynesfdaq?] Y
219 209
220 no more change to split 210 no more change to split
221 1 new orphan changesets 211 1 new orphan changesets
222 $ hg split --rev "desc(fold2)" -d "0 0" << EOF 212 $ hg split --rev "desc(fold2)" -d "0 0" << EOF
223 > Y 213 > Y
230 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 220 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
231 adding E 221 adding E
232 adding F 222 adding F
233 diff --git a/E b/E 223 diff --git a/E b/E
234 new file mode 100644 224 new file mode 100644
235 examine changes to 'E'? 225 examine changes to 'E'? [Ynesfdaq?] Y
236 (enter ? for help) [Ynesfdaq?] Y
237 226
238 @@ -0,0 +1,1 @@ 227 @@ -0,0 +1,1 @@
239 +E 228 +E
240 record change 1/2 to 'E'? 229 record change 1/2 to 'E'? [Ynesfdaq?] Y
241 (enter ? for help) [Ynesfdaq?] Y
242 230
243 diff --git a/F b/F 231 diff --git a/F b/F
244 new file mode 100644 232 new file mode 100644
245 examine changes to 'F'? 233 examine changes to 'F'? [Ynesfdaq?] N
246 (enter ? for help) [Ynesfdaq?] N
247 234
248 created new head 235 created new head
249 continue splitting? [Ycdq?] Y 236 continue splitting? [Ycdq?] Y
250 diff --git a/F b/F 237 diff --git a/F b/F
251 new file mode 100644 238 new file mode 100644
252 examine changes to 'F'? 239 examine changes to 'F'? [Ynesfdaq?] Y
253 (enter ? for help) [Ynesfdaq?] Y
254 240
255 @@ -0,0 +1,1 @@ 241 @@ -0,0 +1,1 @@
256 +F 242 +F
257 record this change to 'F'? 243 record this change to 'F'? [Ynesfdaq?] Y
258 (enter ? for help) [Ynesfdaq?] Y
259 244
260 no more change to split 245 no more change to split
261 1 new orphan changesets 246 1 new orphan changesets
262 $ hg log -G 247 $ hg log -G
263 @ changeset: 15:d4a000f63ee9 248 @ changeset: 15:d4a000f63ee9