Mercurial > evolve

comparison tests/test-evolve-content-divergent-interrupted.t @ 5318:88f9bbba392d mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 15406dfa60e1
comparison
equal deleted inserted replaced
5317:011b53a9d03c 5318:88f9bbba392d
54 54
55 $ echo bar > d 55 $ echo bar > d
56 $ hg amend 56 $ hg amend
57 57
58 $ hg up c41c793e0ef1 --hidden 58 $ hg up c41c793e0ef1 --hidden
59 updating to a hidden changeset c41c793e0ef1
60 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
60 updated to hidden changeset c41c793e0ef1
61 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
62 working directory parent is obsolete! (c41c793e0ef1) 62 working directory parent is obsolete! (c41c793e0ef1)
63 (use 'hg evolve' to update to its successor: e49523854bc8) 63 (use 'hg evolve' to update to its successor: e49523854bc8)
64 64
65 $ echo foobar > d 65 $ echo foobar > d
66 $ hg amend 66 $ hg amend
277 $ echo bar > c 277 $ echo bar > c
278 $ hg add c 278 $ hg add c
279 $ hg amend 279 $ hg amend
280 280
281 $ hg up --hidden c41c793e0ef1 281 $ hg up --hidden c41c793e0ef1
282 updating to a hidden changeset c41c793e0ef1
283 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
282 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 284 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
283 updated to hidden changeset c41c793e0ef1
284 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
285 working directory parent is obsolete! (c41c793e0ef1) 285 working directory parent is obsolete! (c41c793e0ef1)
286 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) 286 (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
287 $ echo bar > d 287 $ echo bar > d
288 $ hg amend 288 $ hg amend
289 2 new content-divergent changesets 289 2 new content-divergent changesets
421 421
422 $ echo bar > d 422 $ echo bar > d
423 $ hg amend 423 $ hg amend
424 424
425 $ hg up c41c793e0ef1 --hidden 425 $ hg up c41c793e0ef1 --hidden
426 updating to a hidden changeset c41c793e0ef1
427 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
426 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 428 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
427 updated to hidden changeset c41c793e0ef1
428 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
429 working directory parent is obsolete! (c41c793e0ef1) 429 working directory parent is obsolete! (c41c793e0ef1)
430 (use 'hg evolve' to update to its successor: e49523854bc8) 430 (use 'hg evolve' to update to its successor: e49523854bc8)
431 431
432 $ echo foobar > d 432 $ echo foobar > d
433 $ hg amend 433 $ hg amend