Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3106:a867d59ea97a mercurial-4.3
test-compat: revert output changes from phase renaming
We keep using the old name for the older version. test has to reflect that.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 20:04:13 +0200 |
| parents | f5d472b7e800 |
| children | 9c9c8c1eeb93 9f900937c198 |
comparison
equal
deleted
inserted
replaced
| 3105:f5d472b7e800 | 3106:a867d59ea97a |
|---|---|
| 629 $ hg update --hidden 'desc(A0)' | 629 $ hg update --hidden 'desc(A0)' |
| 630 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 630 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 631 working directory parent is obsolete! (471f378eab4c) | 631 working directory parent is obsolete! (471f378eab4c) |
| 632 (use 'hg evolve' to update to its successor: fdf9bde5129a) | 632 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
| 633 $ hg amend -m "A2" | 633 $ hg amend -m "A2" |
| 634 2 new content-divergent changesets | 634 2 new divergent changesets |
| 635 $ hg log --hidden -G | 635 $ hg log --hidden -G |
| 636 @ changeset: 3:65b757b745b9 | 636 @ changeset: 3:65b757b745b9 |
| 637 | tag: tip | 637 | tag: tip |
| 638 | parent: 0:ea207398892e | 638 | parent: 0:ea207398892e |
| 639 | user: test | 639 | user: test |
| 640 | date: Thu Jan 01 00:00:00 1970 +0000 | 640 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 641 | instability: content-divergent | 641 | trouble: divergent |
| 642 | summary: A2 | 642 | summary: A2 |
| 643 | | 643 | |
| 644 | o changeset: 2:fdf9bde5129a | 644 | o changeset: 2:fdf9bde5129a |
| 645 |/ parent: 0:ea207398892e | 645 |/ parent: 0:ea207398892e |
| 646 | user: test | 646 | user: test |
| 647 | date: Thu Jan 01 00:00:00 1970 +0000 | 647 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 648 | instability: content-divergent | 648 | trouble: divergent |
| 649 | summary: A1 | 649 | summary: A1 |
| 650 | | 650 | |
| 651 | x changeset: 1:471f378eab4c | 651 | x changeset: 1:471f378eab4c |
| 652 |/ user: test | 652 |/ user: test |
| 653 | date: Thu Jan 01 00:00:00 1970 +0000 | 653 | date: Thu Jan 01 00:00:00 1970 +0000 |