Monotone's diff parsing conflicts with Subversion's - make sure we

do not let mtn recognize svn's underline that marks a new patch.
feature.better-home
Patrick Georgi 2011-01-30 00:14:35 +01:00 committed by Thomas Keller
parent fbd1ebc294
commit 336faa4503
1 changed files with 1 additions and 1 deletions

View File

@ -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;