Mercurial > evolve
view setup.cfg @ 4891:a9929dd36405 stable
pick: don't create any successors when there were no changes (issue6093)
For example, when a changeset that user is trying to pick was already grafted
or rebased (and no obsmarkers were created), pick will naturally say that
there's no changes to commit and will not create the new commit. In that case
it should not mark any changeset as a successor of the picked changeset,
because the actual file changes were already there before picking.
Technically, pick could (and did before this patch) mark the wdir commit as a
successor of picked changeset (may be useful in the most trivial cases when
e.g. wdir is a graft of the required change), but there are cases when the
picked change is introduced in an ancestor of wdir, or even in multiple
ancestors piece by piece. Pick definitely shouldn't be trying to guess
something this complicated, so with this patch it always marks the picked
change as pruned if it gave no changes to commit.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 07 Oct 2019 14:38:56 +0700 |
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