comparison tests/test-evolve-topic.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 0f32359bcf3e fd039a7f0c3c
children
comparison
equal deleted inserted replaced
5833:be8f7eb3f3a0 5834:c2484b0217ee
434 Test to make sure that evolve don't crash with FilteredRepoLookupError when obsolete revs are in play: 434 Test to make sure that evolve don't crash with FilteredRepoLookupError when obsolete revs are in play:
435 ------------------------------------------------------------------------------------------------------ 435 ------------------------------------------------------------------------------------------------------
436 436
437 update to obsolete revision 437 update to obsolete revision
438 $ hg up -r 'min(desc("add fff"))' --hidden 438 $ hg up -r 'min(desc("add fff"))' --hidden
439 updating to a hidden changeset 6a6b7365c751
440 (hidden revision '6a6b7365c751' was rewritten as: 2c295936ac04)
439 switching to topic foo 441 switching to topic foo
440 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 442 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
441 updated to hidden changeset 6a6b7365c751
442 (hidden revision '6a6b7365c751' was rewritten as: 2c295936ac04)
443 working directory parent is obsolete! (6a6b7365c751) 443 working directory parent is obsolete! (6a6b7365c751)
444 (use 'hg evolve' to update to its successor: 2c295936ac04) 444 (use 'hg evolve' to update to its successor: 2c295936ac04)
445 445
446 Evolve: 446 Evolve:
447 $ hg evolve 447 $ hg evolve