view setup.cfg @ 5474:86c6c7951f74

evolve: fix content-div resolution when in parent-child form

case:
"two divergent csets where one is the parent of other"

  cset_b (content-divergent)
  |
  cset_a (content-divergent)
  |
  ~

Before this patch, we were not correctly handling the case when both the
divergent cset are in parent-child form. And its resolution was going
through the logic which solves other variants of content-divergence.

Resolution (after this patch):
merge is performed between the two and parent (or parent's successor,
if apply) of lower one is treated as resolution parent.

[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