Mercurial > evolve
changeset 3062:0cd594fdfd75
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 13 Oct 2017 20:32:50 +0200 |
| parents | f43a310c4338 (current diff) 6f87042766cb (diff) |
| children | ccbcd027ca77 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: