# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1187220132 25200
# Node ID f8aa16533ddf41ce046934d101d076113490aaa2
# Parent  7e05bdeee7dec11c9462698af81ae0156a782a30# Parent  5bbbd1f1d586908932450fcd86d3a95aa2452770
Merge with crew-stable

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -924,8 +924,6 @@ class queue:
                 if line.startswith('diff --git'):
                     self.diffopts().git = True
                     break
-            patchf.seek(0)
-            patchf.truncate()
 
             msg = opts.get('msg', '').rstrip()
             if msg:
@@ -940,6 +938,10 @@ class queue:
                             ci += 1
                         del comments[ci]
                 comments.append(msg)
+
+            patchf.seek(0)
+            patchf.truncate()
+
             if comments:
                 comments = "\n".join(comments) + '\n\n'
                 patchf.write(comments)