# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1187245155 -7200
# Node ID ee6a6592c9972578552ee4524864f971827efcd9
# Parent  5bbbd1f1d586908932450fcd86d3a95aa2452770# Parent  0edea751bbb283aafe333c5adc595ad568a8daf1
Merge with hg-stable

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -916,8 +916,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:
@@ -932,6 +930,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)