Indefero Commit Details

Date:

2011-01-29 17:14:35 (14 years 2 months ago)

Author:

Patrick Georgi

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

336faa4503df5b232aeb219b7dc9829b99811765

Parents:

fbd1ebc294ab80928b414b5d4de38c3163734aad

Message:

Monotone's diff parsing conflicts with Subversion's - make sure we do not let mtn recognize svn's underline that marks a new patch.

Changes:

File differences

-71
72 72
73 73
74 
74
75 75
76 76
77 77
+                $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;␊
                 $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;␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags