Mercurial > evolve

comparison tests/test-evolve-templates.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 d299af4da8d8 8d20c0af010a
children a7fb433faab6 e6e92835d42d
comparison
equal deleted inserted replaced
5158:8d20c0af010a 5159:e5fe3ca5e6ad
281 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 281 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
282 adding a 282 adding a
283 adding b 283 adding b
284 diff --git a/a b/a 284 diff --git a/a b/a
285 new file mode 100644 285 new file mode 100644
286 examine changes to 'a'? 286 examine changes to 'a'? [Ynesfdaq?] y
287 (enter ? for help) [Ynesfdaq?] y
288 287
289 @@ -0,0 +1,1 @@ 288 @@ -0,0 +1,1 @@
290 +42 289 +42
291 record change 1/2 to 'a'? 290 record change 1/2 to 'a'? [Ynesfdaq?] y
292 (enter ? for help) [Ynesfdaq?] y
293 291
294 diff --git a/b b/b 292 diff --git a/b b/b
295 new file mode 100644 293 new file mode 100644
296 examine changes to 'b'? 294 examine changes to 'b'? [Ynesfdaq?] n
297 (enter ? for help) [Ynesfdaq?] n
298 295
299 created new head 296 created new head
300 continue splitting? [Ycdq?] y 297 continue splitting? [Ycdq?] y
301 diff --git a/b b/b 298 diff --git a/b b/b
302 new file mode 100644 299 new file mode 100644
303 examine changes to 'b'? 300 examine changes to 'b'? [Ynesfdaq?] y
304 (enter ? for help) [Ynesfdaq?] y
305 301
306 @@ -0,0 +1,1 @@ 302 @@ -0,0 +1,1 @@
307 +43 303 +43
308 record this change to 'b'? 304 record this change to 'b'? [Ynesfdaq?] y
309 (enter ? for help) [Ynesfdaq?] y
310 305
311 no more change to split 306 no more change to split
312 307
313 $ hg log --hidden -G 308 $ hg log --hidden -G
314 @ changeset: 3:f257fde29c7a 309 @ changeset: 3:f257fde29c7a