# HG changeset patch # User Martin von Zweigbergk # Date 1532556985 25200 # Node ID 9a6a767bef9d521ff20bfa2faeac5d9029665d81 # Parent 93d9cde93b82d4d30d01b76d04a07e50a9ce73f8 builddependencies: consider all divergent successors We were only considering one. In test-evolve-abort-conentdiv.t:165, the input revs were {5, 8} and dependency dict was {8: set([]), 5: set([10])}, which is a little weird (10 is not in the input set). It still worked because the callers used it (they seemed to only care if there were *any* dependencies). This patch fixes the issue by considering all successors. That means the dependency dict will be {8: set([]), 5: set([8, 10])} after this patch. The next patch will remove the 10 from that set. diff -r 93d9cde93b82 -r 9a6a767bef9d hgext3rd/evolve/utility.py --- a/hgext3rd/evolve/utility.py Wed Jul 25 14:00:49 2018 -0700 +++ b/hgext3rd/evolve/utility.py Wed Jul 25 15:16:25 2018 -0700 @@ -104,8 +104,9 @@ succ = _singlesuccessor(repo, p) except MultipleSuccessorsError as exc: tset = set() - for node in exc.successorssets[0]: - tset.add(repo[node].rev()) + for successorsset in exc.successorssets: + for node in successorsset: + tset.add(repo[node].rev()) dependencies[r] = tset continue if succ in revs: