comparison tests/test-touch.t @ 4673:3ef4980353af mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 05 Jun 2019 17:45:45 +0200
parents d70db7e455dc 30a544904238
children 79bc0f1a832e c6fc1000af1e
comparison
equal deleted inserted replaced
4672:653c42af172e 4673:3ef4980353af
30 30
31 $ echo A > b 31 $ echo A > b
32 $ hg add b 32 $ hg add b
33 $ hg commit -m ab --amend 33 $ hg commit -m ab --amend
34 $ hg up --hidden 1 34 $ hg up --hidden 1
35 updating to a hidden changeset [0-9a-f]{12} (re)
36 (hidden revision '*' was rewritten as: *) (glob)
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
36 updated to hidden changeset * (glob)
37 (hidden revision '*' was rewritten as: *) (glob)
38 working directory parent is obsolete! (*) (glob) 38 working directory parent is obsolete! (*) (glob)
39 (use 'hg evolve' to update to its successor: *) (glob) 39 (use 'hg evolve' to update to its successor: *) (glob)
40 $ hg log -G 40 $ hg log -G
41 o 2:[0-9a-f]{12} ab (re) 41 o 2:[0-9a-f]{12} ab (re)
42 42