From 336faa4503df5b232aeb219b7dc9829b99811765 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick.georgi@coresystems.de>
Date: Sun, 30 Jan 2011 00:14:35 +0100
Subject: [PATCH] Monotone's diff parsing conflicts with Subversion's - make
 sure we do not let mtn recognize svn's underline that marks a new patch.

---
 src/IDF/Diff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/IDF/Diff.php b/src/IDF/Diff.php
index f097183..a9be715 100644
--- a/src/IDF/Diff.php
+++ b/src/IDF/Diff.php
@@ -71,7 +71,7 @@ class IDF_Diff
                 $current_chunk = 0;
                 $indiff = true;
                 continue;
-            } else if (0 === strpos($line, '=========')) {
+            } else if (!$indiff && 0 === strpos($line, '=========')) {
                 // ignore pseudo stanzas with a hint of a binary file
                 if (preg_match("/^# (.+) is binary/", $this->lines[$i]))
                     continue;