Mercurial > evolve

comparison tests/test-evolve-templates.t @ 5314:e6e92835d42d 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, 08 May 2020 20:36:29 +0800
parents e5fe3ca5e6ad e8542915d0f7
children 011b53a9d03c eed42a183d46
comparison
equal deleted inserted replaced
5313:e8542915d0f7 5314:e6e92835d42d
300 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 300 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
301 adding a 301 adding a
302 adding b 302 adding b
303 diff --git a/a b/a 303 diff --git a/a b/a
304 new file mode 100644 304 new file mode 100644
305 examine changes to 'a'? 305 examine changes to 'a'? [Ynesfdaq?] y
306 (enter ? for help) [Ynesfdaq?] y
307 306
308 @@ -0,0 +1,1 @@ 307 @@ -0,0 +1,1 @@
309 +42 308 +42
310 record change 1/2 to 'a'? 309 record change 1/2 to 'a'? [Ynesfdaq?] y
311 (enter ? for help) [Ynesfdaq?] y
312 310
313 diff --git a/b b/b 311 diff --git a/b b/b
314 new file mode 100644 312 new file mode 100644
315 examine changes to 'b'? 313 examine changes to 'b'? [Ynesfdaq?] n
316 (enter ? for help) [Ynesfdaq?] n
317 314
318 created new head 315 created new head
319 continue splitting? [Ycdq?] y 316 continue splitting? [Ycdq?] y
320 diff --git a/b b/b 317 diff --git a/b b/b
321 new file mode 100644 318 new file mode 100644
322 examine changes to 'b'? 319 examine changes to 'b'? [Ynesfdaq?] y
323 (enter ? for help) [Ynesfdaq?] y
324 320
325 @@ -0,0 +1,1 @@ 321 @@ -0,0 +1,1 @@
326 +43 322 +43
327 record this change to 'b'? 323 record this change to 'b'? [Ynesfdaq?] y
328 (enter ? for help) [Ynesfdaq?] y
329 324
330 no more change to split 325 no more change to split
331 326
332 $ hg log --hidden -G 327 $ hg log --hidden -G
333 @ changeset: 3:f257fde29c7a 328 @ changeset: 3:f257fde29c7a