Mercurial > evolve

changeset 2990:c2102598adf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: merge with strip related fix
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 26 Sep 2017 12:58:10 +0200
parents 53246d237373 (diff) 62201935e1a7 (current diff)
children f4956eb3a456
files hgext3rd/topic/__init__.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py	Tue Sep 26 12:39:11 2017 +0200
+++ b/hgext3rd/topic/__init__.py	Tue Sep 26 12:58:10 2017 +0200
@@ -312,10 +312,10 @@
                 peer.__class__ = topicpeer
             return peer
 
-        def transaction(self, *a, **k):
+        def transaction(self, desc, *a, **k):
             ctr = self.currenttransaction()
-            tr = super(topicrepo, self).transaction(*a, **k)
-            if ctr is not None:
+            tr = super(topicrepo, self).transaction(desc, *a, **k)
+            if desc is 'strip' or ctr is not None:
                 return tr
 
             # real transaction start