next: fix topic constraint in the --evolve case stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 16 Aug 2018 11:44:32 +0200
branchstable
changeset 3948 836402690a63
parent 3947 5fade2cb9e00
child 3949 6aa526b477af
next: fix topic constraint in the --evolve case We were using the wrong variable.
hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Thu Aug 16 11:43:53 2018 +0200
+++ b/hgext3rd/evolve/__init__.py	Thu Aug 16 11:44:32 2018 +0200
@@ -1166,7 +1166,7 @@
         else:
             aspchildren = evolvecmd._aspiringchildren(repo, [repo['.'].rev()])
             if topic:
-                filtered.extend(repo[c] for c in children
+                filtered.update(repo[c] for c in aspchildren
                                 if repo[c].topic() != topic)
                 aspchildren = [ctx for ctx in aspchildren if ctx not in filtered]
             if not opts['evolve'] or not aspchildren: