Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/topic/stack.py
branchstable
changeset 3044 b185beb94df5
parent 2997 a61634f52742
child 3061 6f87042766cb 
--- a/hgext3rd/topic/stack.py	Mon Oct 09 17:42:30 2017 +0200
+++ b/hgext3rd/topic/stack.py	Tue Oct 10 15:47:11 2017 +0200
@@ -34,9 +34,9 @@
         if topic is not None and branch is not None:
             raise error.ProgrammingError('both branch and topic specified (not defined yet)')
         elif topic is not None:
-            trevs = repo.revs("topic(%s) - obsolete()", topic)
+            trevs = repo.revs("not obsolete() and topic(%s) - obsolete()", topic)
         elif branch is not None:
-            trevs = repo.revs("branch(%s) - public() - obsolete() - topic()", branch)
+            trevs = repo.revs("not public() and branch(%s) - obsolete() - topic()", branch)
         else:
             raise error.ProgrammingError('neither branch and topic specified (not defined yet)')
         self._revs = trevs
evolve