From 902c040add15b6530e7b72a7e068a111910f1626 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Feb 2012 10:37:23 +0000
Subject: [PATCH] handling special case of module "egroupware" in merge

---
 svn-helper.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/svn-helper.php b/svn-helper.php
index 4ac406f860..0671ac1083 100755
--- a/svn-helper.php
+++ b/svn-helper.php
@@ -86,10 +86,11 @@ function do_merge(array $args)
 	//print_r($modules);
 	//print_r($messages);
 	$cmds = array();
-	foreach($modules as $module)
+	foreach($modules as $n => $module)
 	{
 		system('svn -q update '.$module);	// svn >= 1.7 brings an error otherwise
-		$cmds[] = 'svn merge '.implode(' ',$args).'/'.$module.' '.$module;
+		$cmds[] = 'svn merge '.implode(' ',$args).'/'.$module.($module != 'egroupware'?' '.$module:'');
+		if ($module == 'egroupware') $modules[$n] = '.';
 	}
 	$cmds[] = 'svn diff '.implode(' ',$modules);
 	foreach($cmds as $n => $cmd)