From f0255540010ff99e282cb371a7bb5fd59e05614c Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 30 Dec 2009 15:24:48 +0100
Subject: [PATCH] Fix merging Horde changes to Git.

---
 framework/devtools/horde-merge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/devtools/horde-merge.php b/framework/devtools/horde-merge.php
index aaf840343..8ae461066 100755
--- a/framework/devtools/horde-merge.php
+++ b/framework/devtools/horde-merge.php
@@ -59,7 +59,7 @@ foreach ($lines as $line) {
         continue;
     }
     $tok = preg_split('/\s+/', $line, -1, PREG_SPLIT_NO_EMPTY);
-    $file = str_replace(array('horde/', 'Attic/'), '', $tok[3]);
+    $file = str_replace('Attic/', '', $tok[3]);
     if (isset($tok[4]) && $tok[4] == '(dead)') {
         $cmd = $CVS . ' remove -f ' . $file;
         $new_version = $tok[0];
@@ -99,7 +99,7 @@ foreach ($lines as $line) {
             $cmd = sprintf($CVS . ' diff -N -r %s -r %s -kk %s | patch %s',
                            $old_version,
                            $new_version,
-                           $file,
+                           str_replace('horde/', '', $file),
                            $target . $file);
         }
     }
-- 
2.11.0