holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handling special case of module "egroupware" in merge

Browse Source
This commit is contained in:
Ralf Becker 2012-02-15 10:37:23 +00:00
parent 81f42ec050
commit 902c040add
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
svn-helper.php
View File

@ -86,10 +86,11 @@ function do_merge(array $args)
//print_r($modules); //print_r($modules);
//print_r($messages); //print_r($messages);
$cmds = array(); $cmds = array();
foreach($modules as $module) foreach($modules as $n => $module)
{ {
system('svn -q update '.$module); // svn >= 1.7 brings an error otherwise 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); $cmds[] = 'svn diff '.implode(' ',$modules);
foreach($cmds as $n => $cmd) foreach($cmds as $n => $cmd)