changeset 1418:ed9a8b1ee9bd

evolve: fix error in builddependencies When MultipleSuccessorsError was raised, we were still running the code below to add the dependency if succ was not None from a previous iteration. This bug was harmless because dependencies and rdependencies are sets but it makes the code clearer this way.
author Laurent Charignon <lcharignon@fb.com>
date Mon, 22 Jun 2015 12:41:32 -0700
parents 9e7da169f66e
children b54524ae77c0
files hgext/evolve.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Fri Jun 19 18:17:57 2015 -0700
+++ b/hgext/evolve.py	Mon Jun 22 12:41:32 2015 -0700
@@ -1394,6 +1394,7 @@
                 succ = _singlesuccessor(repo, p)
             except MultipleSuccessorsError, exc:
                 dependencies[r] = exc.successorssets
+                continue
             if succ in revs:
                 dependencies[r].add(succ)
                 rdependencies[succ].add(r)