Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3112:706402d70b3f mercurial-3.9
test-compat: merge with mercurial-4.0 branch
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 18:44:52 +0200 |
| parents | 50be10c63825 a456f55b3a6b |
| children | add76a5eb1ae |
comparison
equal
deleted
inserted
replaced
| 3111:7518ff7f26da | 3112:706402d70b3f |
|---|---|
| 67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 68 working directory parent is obsolete! (471f378eab4c) | 68 working directory parent is obsolete! (471f378eab4c) |
| 69 (use 'hg evolve' to update to its successor: d004c8f274b9) | 69 (use 'hg evolve' to update to its successor: d004c8f274b9) |
| 70 | 70 |
| 71 Precursors template should show current revision as it is the working copy | 71 Precursors template should show current revision as it is the working copy |
| 72 $ hg olog tip | |
| 73 o d004c8f274b9 (4) A2 | |
| 74 | | |
| 75 x a468dc9b3633 (3) A1 | |
| 76 | rewritten(description) as d004c8f274b9 by test2 (*) (glob) | |
| 77 | | |
| 78 @ 471f378eab4c (1) A0 | |
| 79 rewritten(description, content) as a468dc9b3633 by test (*) (glob) | |
| 80 | |
| 81 $ hg tlog | 72 $ hg tlog |
| 82 o d004c8f274b9 | 73 o d004c8f274b9 |
| 83 | Precursors: 471f378eab4c | 74 | Precursors: 471f378eab4c |
| 84 | semi-colon: 471f378eab4c | 75 | semi-colon: 471f378eab4c |
| 85 | @ 471f378eab4c | 76 | @ 471f378eab4c |