Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- a/tests/test-evolve-wdir.t Thu Mar 11 14:48:12 2021 +0800 +++ b/tests/test-evolve-wdir.t Thu Mar 11 14:49:22 2021 +0800 @@ -49,9 +49,9 @@ $ mkcommit c_B $ hg amend -m "u_B" $ hg up -r 'desc(c_B)' --hidden + updating to a hidden changeset 707ee88b2870 + (hidden revision '707ee88b2870' was rewritten as: 9bf151312dec) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 707ee88b2870 - (hidden revision '707ee88b2870' was rewritten as: 9bf151312dec) working directory parent is obsolete! (707ee88b2870) (use 'hg evolve' to update to its successor: 9bf151312dec) @@ -73,9 +73,9 @@ working directory is now at 9f0188af4c58 1 changesets pruned $ hg up -r 'desc(c_B)' --hidden + updating to a hidden changeset 707ee88b2870 + (hidden revision '707ee88b2870' is pruned) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 707ee88b2870 - (hidden revision '707ee88b2870' is pruned) working directory parent is obsolete! (707ee88b2870) (use 'hg evolve' to update to its parent successor) @@ -94,9 +94,9 @@ $ hg metaedit -r 'desc(c_B)' -d '0 1' --hidden 2 new content-divergent changesets $ hg up -r 'min(desc(c_B))' --hidden + updating to a hidden changeset 707ee88b2870 + (hidden revision '707ee88b2870' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 707ee88b2870 - (hidden revision '707ee88b2870' has diverged) working directory parent is obsolete! (707ee88b2870) (707ee88b2870 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)