Mercurial > evolve
comparison tests/test-obsolete.t @ 4673:3ef4980353af mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 05 Jun 2019 17:45:45 +0200 |
| parents | d70db7e455dc 653c42af172e |
| children | 79bc0f1a832e 769b907e644e |
comparison
equal
deleted
inserted
replaced
| 4672:653c42af172e | 4673:3ef4980353af |
|---|---|
| 119 3 | 119 3 |
| 120 - 0d3f46688ccc | 120 - 0d3f46688ccc |
| 121 4 | 121 4 |
| 122 - 725c380fe99b | 122 - 725c380fe99b |
| 123 $ hg up --hidden 3 -q | 123 $ hg up --hidden 3 -q |
| 124 updated to hidden changeset 0d3f46688ccc | 124 updating to a hidden changeset 0d3f46688ccc |
| 125 (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) | 125 (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) |
| 126 working directory parent is obsolete! (0d3f46688ccc) | 126 working directory parent is obsolete! (0d3f46688ccc) |
| 127 (reported by parents too) | 127 (reported by parents too) |
| 128 $ hg parents | 128 $ hg parents |
| 129 changeset: 3:0d3f46688ccc | 129 changeset: 3:0d3f46688ccc |
| 705 instability: content-divergent | 705 instability: content-divergent |
| 706 summary: add obsolet_conflicting_d | 706 summary: add obsolet_conflicting_d |
| 707 | 707 |
| 708 | 708 |
| 709 $ hg up --hidden 3 -q | 709 $ hg up --hidden 3 -q |
| 710 updated to hidden changeset 0d3f46688ccc | 710 updating to a hidden changeset 0d3f46688ccc |
| 711 (hidden revision '0d3f46688ccc' has diverged) | 711 (hidden revision '0d3f46688ccc' has diverged) |
| 712 working directory parent is obsolete! (0d3f46688ccc) | 712 working directory parent is obsolete! (0d3f46688ccc) |
| 713 $ hg evolve | 713 $ hg evolve |
| 714 parent is obsolete with multiple successors: | 714 parent is obsolete with multiple successors: |
| 715 [4] add obsol_c' | 715 [4] add obsol_c' |
| 725 | 725 |
| 726 | 726 |
| 727 Check import reports new unstable changeset: | 727 Check import reports new unstable changeset: |
| 728 | 728 |
| 729 $ hg up --hidden 2 | 729 $ hg up --hidden 2 |
| 730 updating to a hidden changeset 4538525df7e2 | |
| 731 (hidden revision '4538525df7e2' has diverged) | |
| 730 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 732 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 731 updated to hidden changeset 4538525df7e2 | |
| 732 (hidden revision '4538525df7e2' has diverged) | |
| 733 working directory parent is obsolete! (4538525df7e2) | 733 working directory parent is obsolete! (4538525df7e2) |
| 734 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) | 734 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
| 735 $ hg export 9468a5f5d8b2 | hg import - | 735 $ hg export 9468a5f5d8b2 | hg import - |
| 736 applying patch from stdin | 736 applying patch from stdin |
| 737 1 new orphan changesets | 737 1 new orphan changesets |