Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3003:ddf28837f5af mercurial-4.0
compat-test: merge future 6.7.0 into 4.0 compat branch
(merging through 4.1 compat branch)
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 01:18:39 +0200 |
| parents | 13c4d518327a 00e4d31b8cdb |
| children | a456f55b3a6b 50be10c63825 |
comparison
equal
deleted
inserted
replaced
| 2810:604ddf1e1a8e | 3003:ddf28837f5af |
|---|---|
| 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 | 72 $ hg olog tip |
| 73 o d004c8f274b9 (4) A2 | 73 o d004c8f274b9 (4) A2 |
| 74 | | 74 | |
| 75 x a468dc9b3633 (3) A1 | 75 x a468dc9b3633 (3) A1 |
| 76 | rewritten(description) by test2 (*) as d004c8f274b9 (glob) | 76 | rewritten(description) as d004c8f274b9 by test2 (*) (glob) |
| 77 | | 77 | |
| 78 @ 471f378eab4c (1) A0 | 78 @ 471f378eab4c (1) A0 |
| 79 rewritten(description, content) by test1 (*) as a468dc9b3633 (glob) | 79 rewritten(description, content) as a468dc9b3633 by test1 (*) (glob) |
| 80 | 80 |
| 81 $ hg tlog | 81 $ hg tlog |
| 82 o d004c8f274b9 | 82 o d004c8f274b9 |
| 83 | Precursors: 471f378eab4c | 83 | Precursors: 471f378eab4c |
| 84 | semi-colon: 471f378eab4c | 84 | semi-colon: 471f378eab4c |
| 118 | x 471f378eab4c | 118 | x 471f378eab4c |
| 119 |/ Successors: [a468dc9b3633] | 119 |/ Successors: [a468dc9b3633] |
| 120 | semi-colon: [a468dc9b3633] | 120 | semi-colon: [a468dc9b3633] |
| 121 o ea207398892e | 121 o ea207398892e |
| 122 | 122 |
| 123 | |
| 124 $ hg up 'desc(A2)' | 123 $ hg up 'desc(A2)' |
| 125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 124 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 126 $ hg tlog | 125 $ hg tlog |
| 127 @ d004c8f274b9 | 126 @ d004c8f274b9 |
| 128 | | 127 | |
| 456 --------------- | 455 --------------- |
| 457 | 456 |
| 458 $ hg up 'desc(A0)' --hidden | 457 $ hg up 'desc(A0)' --hidden |
| 459 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 458 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 460 working directory parent is obsolete! (471f378eab4c) | 459 working directory parent is obsolete! (471f378eab4c) |
| 461 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) | 460 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
| 462 | 461 |
| 463 Precursors template should show current revision as it is the working copy | 462 Precursors template should show current revision as it is the working copy |
| 464 $ hg tlog | 463 $ hg tlog |
| 465 o 019fadeab383 | 464 o 019fadeab383 |
| 466 | Precursors: 471f378eab4c | 465 | Precursors: 471f378eab4c |