Login | Register
My pages Projects Community openCollabNet

Discussions > commits > [WebSVN commit] svn commit: r1288 - trunk/comp.php

websvn
Discussion topic

Back to topic list

[WebSVN commit] svn commit: r1288 - trunk/comp.php

Reply

Author dirkthomas
Full name Dirk Thomas
Date 2012-07-10 23:58:42 PDT
Message Author: dirkthomas
Date: 2012-07-10 23:58:41-0700
New Revision: 1288

Modified:
   trunk/comp.php

Log:
fixed wrong handling of unidiff output for svn 1.7 (fixed #333)

Modified: trunk/comp.php
Url: http://websvn.tigris​.org/source/browse/w​ebsvn/trunk/comp.php​?view=diff&pathr​ev=1288&r1=1287​&r2=1288
====================​====================​====================​==================
--- trunk/comp.php (original)
+++ trunk/comp.php 2012-07-10 23:58:41-0700
@@ -446,9 +446,18 @@
                     if ($debug) print 'Skipping: '.$line.'<br />';
 
                     while ($line = trim(fgets($diff))) {
+ if (version_compare($c​onfig->getSubvers​ionVersion(), '1.7.0') >= 0) {
+ if (!strncmp($line, 'Index: ', 7)) {
+ break;
+ }
+ if (!strncmp($line, '##', 2) || $line == '\ No newline at end of file') {
+ continue;
+ }
+ }
                         $listing[$index++]['info'] = escape(toOutputEncod​ing($line));
                         clearVars();
                     }
+ $getLine = false;
 
                     continue;
                 }

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

[WebSVN commit] svn commit: r1288 - trunk/comp.php dirkthomas Dirk Thomas 2012-07-10 23:58:42 PDT
Messages per page: