comparison tests/test-touch.t @ 5318:88f9bbba392d mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 22:50:09 +0800
parents 1752a2e7a226 e8660b28bfee
children c2484b0217ee
comparison
equal deleted inserted replaced
5317:011b53a9d03c 5318:88f9bbba392d
32 32
33 $ echo A > b 33 $ echo A > b
34 $ hg add b 34 $ hg add b
35 $ hg commit -m ab --amend 35 $ hg commit -m ab --amend
36 $ hg up --hidden 1 36 $ hg up --hidden 1
37 updating to a hidden changeset [0-9a-f]{12} (re)
38 (hidden revision '*' was rewritten as: *) (glob)
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 39 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 updated to hidden changeset * (glob)
39 (hidden revision '*' was rewritten as: *) (glob)
40 working directory parent is obsolete! (*) (glob) 40 working directory parent is obsolete! (*) (glob)
41 (use 'hg evolve' to update to its successor: *) (glob) 41 (use 'hg evolve' to update to its successor: *) (glob)
42 $ hg log -G 42 $ hg log -G
43 o 2:[0-9a-f]{12} ab (re) 43 o 2:[0-9a-f]{12} ab (re)
44 44