docs/tutorials/topic-tutorial.t
author Sushil khanchi <sushilkhanchi97@gmail.com>
Sat, 10 Nov 2018 15:50:05 +0100
changeset 4247 820a25dcea58
parent 2824 d0e3a8e0b62c
permissions lrwxrwxrwx
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2824
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     1
../../tests/test-topic-tutorial.t