From 81f42ec050c09bb1c8ee9b841343101b167cb8cd Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 15 Feb 2012 10:32:08 +0000 Subject: [PATCH] making ^/trunk default for svn-helper.php merge --- svn-helper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/svn-helper.php b/svn-helper.php index 3816ce7a91..4ac406f860 100755 --- a/svn-helper.php +++ b/svn-helper.php @@ -18,7 +18,7 @@ Changes into the directory of each module and executes svn with the given argume \\$module get\'s replaced with the module name, for every svn command but "merge", where log is queryed to avoid running merge on all modules. Examples: - to merge all changes from trunk between revision 123 and 456 into all modules in the workingcopy: - ./svn-helper.php merge -r 123:456 ^/trunk + ./svn-helper.php merge (-c 123|-r 123:456)+ [^/trunk] # multiple -c or -r are allowed, ^/trunk is the default - to switch a workingcopy to the 1.8 branch: ./svn-helper.php switch ^/branches/1.8/\\$module - to switch an anonymous workingcopy to a developers one: @@ -57,6 +57,10 @@ function do_merge(array $args) chdir(dirname(__FILE__)); // go to EGroupware root array_shift($args); // get ride of "merge" arg + if (substr(end($args),0,2) !== '^/' && strpos(end($args),'://') === false) + { + array_push($args,'^/trunk'); + } // get xml log $cmd = "svn log --verbose --xml ".implode(' ',$args); //echo $cmd;