comparison tests/test-touch.t @ 3914:96945ea908df stable

branching: merge default into stable The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch policy requires this merge. The @ bookmark is in the right location, so people doing clone will get to the latest release.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 31 Jul 2018 12:52:06 +0200
parents 1e103c7f7663
children f7afd3a158e3 8232bddf543a
comparison
equal deleted inserted replaced
3901:f2b8429db565 3914:96945ea908df
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) 35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
36 updated to hidden changeset * (glob)
36 (hidden revision '*' was rewritten as: *) (glob) 37 (hidden revision '*' was rewritten as: *) (glob)
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
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