Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 13 Oct 2017 20:32:50 +0200
changeset 3062 0cd594fdfd75
parent 3060 f43a310c4338 (current diff)
parent 3061 6f87042766cb (diff)
child 3063 ccbcd027ca77
branching: merge with stable
hgext3rd/evolve/metadata.py file | annotate | diff | comparison | revisions
hgext3rd/topic/__init__.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/metadata.py	Fri Oct 13 10:18:52 2017 +0530
+++ b/hgext3rd/evolve/metadata.py	Fri Oct 13 20:32:50 2017 +0200
@@ -6,6 +6,7 @@
 # GNU General Public License version 2 or any later version.
 
 __version__ = '6.8.0.dev'
+>>>>>>> merge rev:    6f87042766cb stable - pierre-yves: topic: remove a sill...
 testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.3 4.3.2'
 minimumhgversion = '3.8'
 buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/stack.py	Fri Oct 13 10:18:52 2017 +0530
+++ b/hgext3rd/topic/stack.py	Fri Oct 13 20:32:50 2017 +0200
@@ -34,7 +34,7 @@
         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("not obsolete() and topic(%s) - obsolete()", topic)
+            trevs = repo.revs("not obsolete() and topic(%s)", topic)
         elif branch is not None:
             trevs = repo.revs("not public() and branch(%s) - obsolete() - topic()", branch)
         else:
evolve