Mercurial > evolve
view setup.cfg @ 3827:82c72eb37f85
evolve: strip the relocation commit on `hg evolve --stop`
While resolving content-divergence on multiple parents, we relocate one of the
commit on the parent of another one and then merge the divergent changesets.
Merging can leads to conflicts, and if user does `hg evolve --stop`, we need to
strip that relocated changeset too! This patch does that.
Test changes demonstrates the fix.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 11 Jun 2018 00:47:28 +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