topic: merge with strip related fix
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 26 Sep 2017 12:58:10 +0200
changeset 2990 c2102598adf5
parent 2989 53246d237373 (diff)
parent 2988 62201935e1a7 (current diff)
child 2991 f4956eb3a456
topic: merge with strip related fix
hgext3rd/topic/__init__.py
--- 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