view setup.cfg @ 5514:4c3656aaacc6

evolve: make sure we don't miss merging content of divergent changesets

It was skipping _mergecontentdivergents() in the continue case of
content-divergence when we hit merge conflict in relocation of
"divergent" and relocation of "other" is not required.
And because of this skip, merging the content of two divergent
changesets was not performed correctly.

Changes in test file reflect the fixed behavior.

[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