From 58a5bc46d9982e8f87f6e39efed8f663834efe04 Mon Sep 17 00:00:00 2001
From: Thomas Keller <me@thomaskeller.biz>
Date: Thu, 24 Feb 2011 13:38:42 +0100
Subject: [PATCH] Temporarily disable the change view and diff download for
 merge revisions until issue 581 has been fixed properly.

---
 src/IDF/templates/idf/source/commit.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/IDF/templates/idf/source/commit.html b/src/IDF/templates/idf/source/commit.html
index e07d373..b276d03 100644
--- a/src/IDF/templates/idf/source/commit.html
+++ b/src/IDF/templates/idf/source/commit.html
@@ -23,7 +23,7 @@
 </tr>{/if}
 <tr>
 <th><strong>{trans 'Message:'}</strong></th><td>{issuetext $cobject.title, $request}{if isset($cobject.full_message)}<br/><br/>{issuetext $cobject.full_message, $request, true, false, true, true, true}{/if}</td>
-</tr>{if count($changes)}
+</tr>{if count($cobject.parents) < 2 and count($changes)}
 <tr>
 <th><strong>{trans 'Changes:'}</strong></th>
 <td>
@@ -61,11 +61,13 @@
 </tr>{/if} {* End of the if count($changes) *}
 </table>
 
-{if count($diff.files)}
+{if count($cobject.parents) < 2 and count($diff.files)}
 <h2>{trans 'File differences'}</h2>
 
 {$diff.as_html()}
-{/if}{if count($diff.files) or $large_commit}
+{/if}
+
+{if count($cobject.parents) < 2 and (count($diff.files) or $large_commit)}
 {aurl 'url', 'IDF_Views_Source::downloadDiff', array($project.shortname, $commit)}
 <p class="right soft"><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/package-grey.png'}" alt="{trans 'Archive'}" align="bottom"/></a> <a href="{$url}">{trans 'Download the corresponding diff file'}</a></p>
 {/if}