diff -r 2a500c5e293b -r 769b907e644e tests/test-evolve-content-divergent-basic.t --- a/tests/test-evolve-content-divergent-basic.t Fri Sep 27 13:03:18 2019 +0200 +++ b/tests/test-evolve-content-divergent-basic.t Fri Sep 27 13:03:20 2019 +0200 @@ -204,9 +204,9 @@ changed branch on 1 changesets $ hg up c41c793e0ef1 --hidden + updating to a hidden changeset c41c793e0ef1 + (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: 9e5dffcb3d48) $ echo bar > d @@ -310,9 +310,9 @@ $ hg amend -m "foo to d" $ hg up a9d6fd6b5e40 --hidden + updating to a hidden changeset a9d6fd6b5e40 + (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset a9d6fd6b5e40 - (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) working directory parent is obsolete! (a9d6fd6b5e40) (use 'hg evolve' to update to its successor: b10b07a394f1) $ echo babar > d @@ -370,9 +370,9 @@ $ hg amend -m "bar to d, expect beers" $ hg up 11175423b5dc --hidden + updating to a hidden changeset 11175423b5dc + (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 11175423b5dc - (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) working directory parent is obsolete! (11175423b5dc) (use 'hg evolve' to update to its successor: 27f0463f169a) $ echo wat > d @@ -480,9 +480,9 @@ $ echo 'babar' >> a $ hg amend $ hg up --hidden 'min(desc("More addition"))' + updating to a hidden changeset 867e43582046 + (hidden revision '867e43582046' was rewritten as: fc6349f931da) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 867e43582046 - (hidden revision '867e43582046' was rewritten as: fc6349f931da) working directory parent is obsolete! (867e43582046) (use 'hg evolve' to update to its successor: fc6349f931da) $ mv a a.old @@ -573,9 +573,9 @@ $ hg up --hidden 'min(desc("More addition"))' + updating to a hidden changeset 867e43582046 + (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 867e43582046 - (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1) working directory parent is obsolete! (867e43582046) (use 'hg evolve' to update to its successor: 5bf84d1d71d1) $ echo 'gotta break' >> a @@ -750,9 +750,9 @@ > EOF $ hg commit --amend -m E2 $ hg --hidden update -r 'desc(E1)' + updating to a hidden changeset 4a250e5bd992 + (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 4a250e5bd992 - (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) working directory parent is obsolete! (4a250e5bd992) (use 'hg evolve' to update to its successor: 084ae625fa51) $ cat << EOF > numbers