From d4b960e8bbffeba2bcb69ce3a0da9fef07997753 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 28 Mar 2012 11:44:45 +0000
Subject: [PATCH] update for egroupware module was missing

---
 svn-helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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