--- a/src/topic/__init__.py	Fri Jun 12 16:41:10 2015 -0500
+++ b/src/topic/__init__.py	Fri Jun 12 16:49:46 2015 -0500
@@ -44,9 +44,10 @@
     orig = repo.__class__
     class topicrepo(repo.__class__):
         def commitctx(self, ctx, error=None):
-            current = self.currenttopic
-            if current:
-                ctx.extra()[constants.extrakey] = current
+            if isinstance(ctx, context.workingcommitctx):
+                current = self.currenttopic
+                if current:
+                    ctx.extra()[constants.extrakey] = current
             return orig.commitctx(self, ctx, error=error)
 
         @property