Mercurial > evolve

comparison tests/test-evolve-templates.t @ 3004:a456f55b3a6b mercurial-3.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat-test: merge future 6.7.0 into 3.9 compat branch (merging through 4.0 compat branch)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 01:22:58 +0200
parents 49494d0155b7 ddf28837f5af
children 706402d70b3f
comparison
equal deleted inserted replaced
2811:35d053d7bd87 3004:a456f55b3a6b
109 | x 471f378eab4c 109 | x 471f378eab4c
110 |/ Successors: [a468dc9b3633] 110 |/ Successors: [a468dc9b3633]
111 | semi-colon: [a468dc9b3633] 111 | semi-colon: [a468dc9b3633]
112 o ea207398892e 112 o ea207398892e
113 113
114
115 $ hg up 'desc(A2)' 114 $ hg up 'desc(A2)'
116 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 115 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
117 $ hg tlog 116 $ hg tlog
118 @ d004c8f274b9 117 @ d004c8f274b9
119 | 118 |
447 --------------- 446 ---------------
448 447
449 $ hg up 'desc(A0)' --hidden 448 $ hg up 'desc(A0)' --hidden
450 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 449 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
451 working directory parent is obsolete! (471f378eab4c) 450 working directory parent is obsolete! (471f378eab4c)
452 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) 451 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
453 452
454 Precursors template should show current revision as it is the working copy 453 Precursors template should show current revision as it is the working copy
455 $ hg tlog 454 $ hg tlog
456 o 019fadeab383 455 o 019fadeab383
457 | Precursors: 471f378eab4c 456 | Precursors: 471f378eab4c