Mercurial > evolve
comparison tests/test-evolve-wdir.t @ 5834:c2484b0217ee mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Mar 2021 14:49:22 +0800 |
| parents | 053f1fc12545 c5dfbbe4363d |
| children |
comparison
equal
deleted
inserted
replaced
| 5833:be8f7eb3f3a0 | 5834:c2484b0217ee |
|---|---|
| 47 $ cd repo | 47 $ cd repo |
| 48 $ mkcommit c_A | 48 $ mkcommit c_A |
| 49 $ mkcommit c_B | 49 $ mkcommit c_B |
| 50 $ hg amend -m "u_B" | 50 $ hg amend -m "u_B" |
| 51 $ hg up -r 'desc(c_B)' --hidden | 51 $ hg up -r 'desc(c_B)' --hidden |
| 52 updating to a hidden changeset 707ee88b2870 | |
| 53 (hidden revision '707ee88b2870' was rewritten as: 9bf151312dec) | |
| 52 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 54 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 53 updated to hidden changeset 707ee88b2870 | |
| 54 (hidden revision '707ee88b2870' was rewritten as: 9bf151312dec) | |
| 55 working directory parent is obsolete! (707ee88b2870) | 55 working directory parent is obsolete! (707ee88b2870) |
| 56 (use 'hg evolve' to update to its successor: 9bf151312dec) | 56 (use 'hg evolve' to update to its successor: 9bf151312dec) |
| 57 | 57 |
| 58 $ hg evolve | 58 $ hg evolve |
| 59 update:[2] u_B | 59 update:[2] u_B |
| 71 $ hg prune . | 71 $ hg prune . |
| 72 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 72 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 73 working directory is now at 9f0188af4c58 | 73 working directory is now at 9f0188af4c58 |
| 74 1 changesets pruned | 74 1 changesets pruned |
| 75 $ hg up -r 'desc(c_B)' --hidden | 75 $ hg up -r 'desc(c_B)' --hidden |
| 76 updating to a hidden changeset 707ee88b2870 | |
| 77 (hidden revision '707ee88b2870' is pruned) | |
| 76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 77 updated to hidden changeset 707ee88b2870 | |
| 78 (hidden revision '707ee88b2870' is pruned) | |
| 79 working directory parent is obsolete! (707ee88b2870) | 79 working directory parent is obsolete! (707ee88b2870) |
| 80 (use 'hg evolve' to update to its parent successor) | 80 (use 'hg evolve' to update to its parent successor) |
| 81 | 81 |
| 82 $ hg evolve | 82 $ hg evolve |
| 83 update:[0] c_A | 83 update:[0] c_A |
| 92 | 92 |
| 93 $ hg metaedit -r 'desc(u_B)' -d '0 1' --hidden | 93 $ hg metaedit -r 'desc(u_B)' -d '0 1' --hidden |
| 94 $ hg metaedit -r 'desc(c_B)' -d '0 1' --hidden | 94 $ hg metaedit -r 'desc(c_B)' -d '0 1' --hidden |
| 95 2 new content-divergent changesets | 95 2 new content-divergent changesets |
| 96 $ hg up -r 'min(desc(c_B))' --hidden | 96 $ hg up -r 'min(desc(c_B))' --hidden |
| 97 updating to a hidden changeset 707ee88b2870 | |
| 98 (hidden revision '707ee88b2870' has diverged) | |
| 97 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 98 updated to hidden changeset 707ee88b2870 | |
| 99 (hidden revision '707ee88b2870' has diverged) | |
| 100 working directory parent is obsolete! (707ee88b2870) | 100 working directory parent is obsolete! (707ee88b2870) |
| 101 (707ee88b2870 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) | 101 (707ee88b2870 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
| 102 | 102 |
| 103 $ hg evolve | 103 $ hg evolve |
| 104 parent is obsolete with multiple successors: | 104 parent is obsolete with multiple successors: |