Mercurial > evolve
comparison tests/test-obsolete.t @ 6007:ee54e02d3ea0 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 12 Aug 2021 22:01:17 +0200 |
| parents | 0f32359bcf3e |
| children |
comparison
equal
deleted
inserted
replaced
| 6006:90af9db93d2b | 6007:ee54e02d3ea0 |
|---|---|
| 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 |
| 547 pushing to ../other-new | 547 pushing to ../other-new |
| 548 searching for changes | 548 searching for changes |
| 549 adding changesets | 549 adding changesets |
| 550 adding manifests | 550 adding manifests |
| 551 adding file changes | 551 adding file changes |
| 552 added 1 changesets with 1 changes to 1 files | 552 added 1 changesets with 1 changes to [12] files (re) |
| 553 2 new obsolescence markers | 553 2 new obsolescence markers |
| 554 obsoleted 1 changesets | 554 obsoleted 1 changesets |
| 555 $ hg up -q 'desc("re:^add obsol_c'\''$")' | 555 $ hg up -q 'desc("re:^add obsol_c'\''$")' |
| 556 $ mkcommit "obsol_d'''" | 556 $ mkcommit "obsol_d'''" |
| 557 created new head | 557 created new head |
| 691 | 691 |
| 692 | 692 |
| 693 Check import reports new unstable changeset: | 693 Check import reports new unstable changeset: |
| 694 | 694 |
| 695 $ hg up --hidden 'desc("re:^add c$")' | 695 $ hg up --hidden 'desc("re:^add c$")' |
| 696 updating to a hidden changeset 4538525df7e2 | |
| 697 (hidden revision '4538525df7e2' was rewritten as: 725c380fe99b) | |
| 696 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | 698 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 697 updated to hidden changeset 4538525df7e2 | |
| 698 (hidden revision '4538525df7e2' was rewritten as: 725c380fe99b) | |
| 699 working directory parent is obsolete! (4538525df7e2) | 699 working directory parent is obsolete! (4538525df7e2) |
| 700 (use 'hg evolve' to update to its successor: 725c380fe99b) | 700 (use 'hg evolve' to update to its successor: 725c380fe99b) |
| 701 $ hg export 'desc("re:^add obsol_d'\'\''$")' | hg import - | 701 $ hg export 'desc("re:^add obsol_d'\'\''$")' | hg import - |
| 702 applying patch from stdin | 702 applying patch from stdin |
| 703 1 new orphan changesets | 703 1 new orphan changesets |