comparison tests/test-tutorial.t @ 4694:b6a7d2594ff3

evolve: refactor for consistent behavior of evolve when wdp is obsolete This patch make sure that when working directory parent is obsolete `hg evolve` and `hg evolve --all` don't behave differently.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sun, 09 Jun 2019 12:07:08 +0530
parents 6f6fec14e607
children 5d50f3de4714 5113b38cb677
comparison
equal deleted inserted replaced
4693:6f6fec14e607 4694:b6a7d2594ff3
1526 (use 'hg evolve' to update to its successor: 2a2b36e14660) 1526 (use 'hg evolve' to update to its successor: 2a2b36e14660)
1527 $ hg evolve 1527 $ hg evolve
1528 update:[8] animals 1528 update:[8] animals
1529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1530 working directory is now at 2a2b36e14660 1530 working directory is now at 2a2b36e14660
1531 no troubled changesets
1532 1531
1533 Relocating unstable change after prune 1532 Relocating unstable change after prune
1534 ---------------------------------------------- 1533 ----------------------------------------------
1535 1534
1536 The remote guy keeps working. 1535 The remote guy keeps working.