comparison docs/obs-terms.rst @ 4241:df22f010cf24

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 07ce6c063c61
children 8406d9b06130
comparison
equal deleted inserted replaced
4240:323b3dac5bba 4241:df22f010cf24