diff CHANGELOG @ 4247:820a25dcea58

next: make next command --evolve by default Before this patch, if we need to evolve to update to the next child, we were suggesting the user to use --evolve flag. This patch make some changes to evolve by default in that conditions. After making next command to evolve by default we have to consider the following points: 1) If we don't need to evolve while updating to the next child: a) And if wdir is dirty, we suggest to use --merge flag b) if wdir is clean, we simply update to next child (if ambiguous, prompt the user to select one) 2) If we need to evolve: a) when wdir is dirty, we suggest the user to use `hg shelve` first, to make wdir clean. As we don't support --merge while evovling. b) when wdir is clean, we evolve the next cset. Changes made in test-prev-next.t reflect the changed behaviour.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 10 Nov 2018 15:50:05 +0100
parents 2d9902f0ff17
children a07cd1d076bb
line wrap: on
line diff
--- a/CHANGELOG	Mon Nov 05 19:56:33 2018 +0800
+++ b/CHANGELOG	Sat Nov 10 15:50:05 2018 +0100
@@ -5,6 +5,7 @@
 -------------------
 
   * push: have `--publish` overrule the `auto-publish` config
+  * next: evolve aspiring children by default (use --no-evolve to skip)
 
 8.3.2 - in progress
 -------------------