# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1506423490 -7200
# Node ID c2102598adf51db7473c6a15001044bbda0c5c0a
# Parent  53246d23737350d6e6abef1734aeddd29f5788ba# Parent  62201935e1a7a74194c6f916ff1b5a174e978833
topic: merge with strip related fix

diff -r 62201935e1a7 -r c2102598adf5 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