comparison tests/test-evolve-stop-contentdiv.t @ 3933:1194c850fe2a mercurial-4.6

test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:19:45 +0200
parents f7afd3a158e3
children d00f0c369bc7
comparison
equal deleted inserted replaced
3932:35b2d201eb71 3933:1194c850fe2a
40 40
41 $ echo bar > d 41 $ echo bar > d
42 $ hg amend 42 $ hg amend
43 43
44 $ hg up c41c793e0ef1 --hidden 44 $ hg up c41c793e0ef1 --hidden
45 updating to a hidden changeset c41c793e0ef1
46 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 47 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
46 updated to hidden changeset c41c793e0ef1
47 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
48 working directory parent is obsolete! (c41c793e0ef1) 48 working directory parent is obsolete! (c41c793e0ef1)
49 (use 'hg evolve' to update to its successor: e49523854bc8) 49 (use 'hg evolve' to update to its successor: e49523854bc8)
50 50
51 $ echo foobar > d 51 $ echo foobar > d
52 $ hg amend 52 $ hg amend