--- a/hgext/mq.py	Sun Mar 13 15:04:13 2011 +0100
+++ b/hgext/mq.py	Sun Mar 13 16:18:46 2011 +0100
@@ -1455,9 +1455,10 @@
 
             try:
                 # might be nice to attempt to roll back strip after this
-                patchf.rename()
                 n = repo.commit(message, user, ph.date, match=match,
                                 force=True)
+                # only write patch after a successful commit
+                patchf.rename()
                 self.applied.append(statusentry(n, patchfn))
             except:
                 ctx = repo[cparents[0]]