Mercurial > evolve
comparison tests/test-evolve-templates.t @ 2553:85cabd631a1b
default: merge back with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 07 Jun 2017 01:38:48 +0100 |
| parents | abe6dfbdc744 |
| children | 41a1d2a93223 |
comparison
equal
deleted
inserted
replaced
| 2552:006400e25e22 | 2553:85cabd631a1b |
|---|---|
| 462 --------------- | 462 --------------- |
| 463 | 463 |
| 464 $ hg up 'desc(A0)' --hidden | 464 $ hg up 'desc(A0)' --hidden |
| 465 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 465 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 466 working directory parent is obsolete! (471f378eab4c) | 466 working directory parent is obsolete! (471f378eab4c) |
| 467 (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) | 467 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) |
| 468 | 468 |
| 469 Precursors template should show current revision as it is the working copy | 469 Precursors template should show current revision as it is the working copy |
| 470 $ hg tlog | 470 $ hg tlog |
| 471 o 019fadeab383 | 471 o 019fadeab383 |
| 472 | Precursors: 471f378eab4c | 472 | Precursors: 471f378eab4c |