Mercurial > evolve
view setup.cfg @ 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 | b81d3775006b |
children |
line wrap: on
line source
[flake8] ignore = #closing bracket does not match indentation of opening bracket's line E123, # closing bracket does not match visual indentation E124, # visually indented line with same indent as next logical line E129, # at least two spaces before inline comment E261, # too many leading '#' for block comment E266, # expected 2 blank lines, found 0 E302, # expected 2 blank lines after end of function or class E305, # module level import not at top of file E402, # line too long (82 > 79 characters) E501, # do not assign a lambda expression, use a def E731, # class names should use CapWords convention N801, # line break occurred before a binary operator W503 builtins=xrange, execfile