Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Aug 12 22:01:14 2021 +0200 +++ b/tests/test-obsolete.t Thu Aug 12 22:01:17 2021 +0200 @@ -121,7 +121,7 @@ 4 - 725c380fe99b $ hg up --hidden 3 -q - updated to hidden changeset 0d3f46688ccc + updating to a hidden changeset 0d3f46688ccc (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) @@ -549,7 +549,7 @@ adding changesets adding manifests adding file changes - added 1 changesets with 1 changes to 1 files + added 1 changesets with 1 changes to [12] files (re) 2 new obsolescence markers obsoleted 1 changesets $ hg up -q 'desc("re:^add obsol_c'\''$")' @@ -693,9 +693,9 @@ Check import reports new unstable changeset: $ hg up --hidden 'desc("re:^add c$")' + updating to a hidden changeset 4538525df7e2 + (hidden revision '4538525df7e2' was rewritten as: 725c380fe99b) 1 files updated, 0 files merged, 3 files removed, 0 files unresolved - updated to hidden changeset 4538525df7e2 - (hidden revision '4538525df7e2' was rewritten as: 725c380fe99b) working directory parent is obsolete! (4538525df7e2) (use 'hg evolve' to update to its successor: 725c380fe99b) $ hg export 'desc("re:^add obsol_d'\'\''$")' | hg import -