natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
do not let mtn recognize svn's underline that marks a new patch.
This commit is contained in:
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IDF/Diff.php
View File

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