Mercurial > evolve
view setup.cfg @ 6101:431bf23df350
obsolete-parent: evolve the case when parent has multiple successors
Before this patch, we were used to return error that parent has multiple
successors and exit.
This patch take more care of that case and if obsolete parent's successors are:
1) split successors, then we check if they are on a single topological
branch we update to tipmost, otherwise we ask user to select.
2) divergent successors, we suggest user to `hg update` to one of the
successors and run `hg evolve --content-div` to resolve the problem.
Changes in test file shows the updated behavior.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Thu, 29 Jul 2021 00:12:10 +0530 |
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