builddependencies: don't remove found deps when divergence found (issue5946)
It seems obviously wrong to not keep any dependencies for a revision
that we had already found (for p1) if we run into divergence (from
p2). It also happens to fix issue5946 :)
[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