Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3412:7d4347e1b1d5 stable
tests: update test output to match 4.4
The stable branch is sitll 4.4.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 20:45:13 +0100 |
| parents | e1f3e43a50a4 |
| children | d3a17c67f85c 85cdce113c2c |
comparison
equal
deleted
inserted
replaced
| 3411:e1f3e43a50a4 | 3412:7d4347e1b1d5 |
|---|---|
| 1159 @ f897c6137566 | 1159 @ f897c6137566 |
| 1160 | | 1160 | |
| 1161 o ea207398892e | 1161 o ea207398892e |
| 1162 | 1162 |
| 1163 $ hg up -r "desc(B0)" --hidden | 1163 $ hg up -r "desc(B0)" --hidden |
| 1164 updating to a hidden changeset 0dec01379d3b | |
| 1165 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1164 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1166 working directory parent is obsolete! (0dec01379d3b) | 1165 working directory parent is obsolete! (0dec01379d3b) |
| 1167 (use 'hg evolve' to update to its parent successor) | 1166 (use 'hg evolve' to update to its parent successor) |
| 1168 $ hg tlog | 1167 $ hg tlog |
| 1169 o f897c6137566 | 1168 o f897c6137566 |
| 1524 |/ Obsfate: rewritten as 2:0dec01379d3b | 1523 |/ Obsfate: rewritten as 2:0dec01379d3b |
| 1525 | | 1524 | |
| 1526 o ea207398892e | 1525 o ea207398892e |
| 1527 | 1526 |
| 1528 $ hg up --hidden 4 | 1527 $ hg up --hidden 4 |
| 1529 updating to a hidden changeset 9bd10a0775e4 | |
| 1530 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1528 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1531 working directory parent is obsolete! (9bd10a0775e4) | 1529 working directory parent is obsolete! (9bd10a0775e4) |
| 1532 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) | 1530 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
| 1533 $ hg rebase -r 7 -d 8 --config extensions.rebase= | 1531 $ hg rebase -r 7 -d 8 --config extensions.rebase= |
| 1534 rebasing 7:ba2ed02b0c9a "Add A,B,C" | 1532 rebasing 7:ba2ed02b0c9a "Add A,B,C" |