Mercurial > evolve

comparison tests/test-evolve-content-divergent-corner-cases.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 011b53a9d03c
children 15406dfa60e1
comparison
equal deleted inserted replaced
5317:011b53a9d03c 5318:88f9bbba392d
413 $ hg amend 413 $ hg amend
414 414
415 create some content divergence 415 create some content divergence
416 416
417 $ hg co dff6e52f5e41 --hidden 417 $ hg co dff6e52f5e41 --hidden
418 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 418 updating to a hidden changeset dff6e52f5e41
419 updated to hidden changeset dff6e52f5e41
420 (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) 419 (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670)
420 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
421 working directory parent is obsolete! (dff6e52f5e41) 421 working directory parent is obsolete! (dff6e52f5e41)
422 (use 'hg evolve' to update to its successor: 0825dcee2670) 422 (use 'hg evolve' to update to its successor: 0825dcee2670)
423 $ hg revert -r .^ c 423 $ hg revert -r .^ c
424 $ hg amend 424 $ hg amend
425 2 new content-divergent changesets 425 2 new content-divergent changesets