# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1231748025 -3600
# Node ID e9da3de01e0a1641bd495ce82dc149efa63a88d6
# Parent  6c89dd0a7797ae745eae566af2cbe3a5809f9535# Parent  f9fcb189c8e22454bb49a8dcb0b1112404d03ca9
merge with crew-stable

diff -r 6c89dd0a7797 -r e9da3de01e0a hgext/mq.py
--- a/hgext/mq.py	Fri Jan 09 22:15:08 2009 +0000
+++ b/hgext/mq.py	Mon Jan 12 09:13:45 2009 +0100
@@ -756,7 +756,7 @@
                     self.series_dirty = 1
                     self.applied_dirty = 1
                     if msg:
-                        msg = msg + "\n"
+                        msg = msg + "\n\n"
                         p.write(msg)
                     if commitfiles:
                         diffopts = self.diffopts()
diff -r 6c89dd0a7797 -r e9da3de01e0a templates/monoblue/map
--- a/templates/monoblue/map	Fri Jan 09 22:15:08 2009 +0000
+++ b/templates/monoblue/map	Mon Jan 12 09:13:45 2009 +0100
@@ -49,7 +49,7 @@
 diffblock = '<pre>#lines#</pre>'
 filediffparent = '<dt>parent {rev}</dt><dd><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>'
 filelogparent = '<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filediffchild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
+filediffchild = '<dt>child {rev}</dt><dd><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>'
 filelogchild = '<tr><td align="right">child #rev#:&nbsp;</td><td><a href="{url}file{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
 shortlog = shortlog.tmpl
 tagtag = '<span class="tagtag" title="{name}">{name}</span> '
diff -r 6c89dd0a7797 -r e9da3de01e0a tests/test-mq-header-date.out
--- a/tests/test-mq-header-date.out	Fri Jan 09 22:15:08 2009 +0000
+++ b/tests/test-mq-header-date.out	Mon Jan 12 09:13:45 2009 +0100
@@ -48,6 +48,7 @@
 # Date 6 0
 
 Three
+
 1: Three - test - 6.00
 0: [mq]: 1.patch - test - 4.00
 ==== qref
diff -r 6c89dd0a7797 -r e9da3de01e0a tests/test-mq-header-from.out
--- a/tests/test-mq-header-from.out	Fri Jan 09 22:15:08 2009 +0000
+++ b/tests/test-mq-header-from.out	Mon Jan 12 09:13:45 2009 +0100
@@ -46,6 +46,7 @@
 From: test
 
 Three
+
 2: Three - test
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
diff -r 6c89dd0a7797 -r e9da3de01e0a tests/test-mq-qnew.out
--- a/tests/test-mq-qnew.out	Fri Jan 09 22:15:08 2009 +0000
+++ b/tests/test-mq-qnew.out	Mon Jan 12 09:13:45 2009 +0100
@@ -15,6 +15,7 @@
 abort: missing: No such file or directory
 % qnew -m
 foo bar
+
 % qnew twice
 abort: patch "first.patch" already exists
 abort: patch "first.patch" already exists