From ef3548d3878a2f72028d5cecbe33bb81c4875291 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 23 Oct 2006 22:10:52 +0000
Subject: [PATCH] prendre en compte le format de .svn/entries de SVN 1.4.0
---
ecrire/inc/minipres.php | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php
index 5397362d17..de88b5b591 100644
--- a/ecrire/inc/minipres.php
+++ b/ecrire/inc/minipres.php
@@ -164,9 +164,16 @@ function version_svn_courante($dir) {
// version installee par SVN
if (lire_fichier($dir . '/.svn/entries', $c)
- AND preg_match_all(
- ',committed-rev="([0-9]+)",', $c, $r1, PREG_PATTERN_ORDER))
- return -max($r1[1]);
+ AND (
+ (preg_match_all(
+ ',committed-rev="([0-9]+)",', $c, $r1, PREG_PATTERN_ORDER)
+ AND $v = max($r1[1])
+ )
+ OR
+ (preg_match(',^8.*dir[\r\n]+(\d+),ms', $c, $r1) # svn >= 1.4
+ AND $v = $r1[1]
+ )))
+ return -$v;
// version installee par paquet ZIP de SPIP-Zone
if (lire_fichier($dir.'/svn.revision', $c)
--
GitLab