Comments
Patch
@@ -17,11 +17,11 @@ def _destmergebranch(orig, repo, action=
if sourceset is None:
p1 = repo['.']
else:
# XXX: using only the max here is flacky. That code should eventually
# be updated to take care of the whole sourceset.
- p1 = repo[max(sourceset)]
+ p1 = repo[max(sourceset)]
top = p1.topic()
if top:
revs = repo.revs('topic(%s) - obsolete()', top)
deps, rdeps = builddependencies(repo, revs)
heads = [r for r in revs if not rdeps[r]]
@@ -1,2 +1,2 @@
[flake8]
-ignore = E261, E266, E302, E129, E731, E124, E713, E301, E501, E111, E123, E222
+ignore = E261, E266, E302, E129, E731, E124, E713, E301, E501, E111, E123