comparison tests/test-touch.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 88f9bbba392d a1dad44fe3da
children ee54e02d3ea0
comparison
equal deleted inserted replaced
5833:be8f7eb3f3a0 5834:c2484b0217ee
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