extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 03:19:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

making ^/trunk default for svn-helper.php merge

Browse Source
This commit is contained in:
Ralf Becker 2012-02-15 10:32:08 +00:00
parent 0b3f4a04f0
commit 81f42ec050
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
svn-helper.php
View File

@ -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. \\$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: Examples:
- to merge all changes from trunk between revision 123 and 456 into all modules in the workingcopy: - 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: - to switch a workingcopy to the 1.8 branch:
./svn-helper.php switch ^/branches/1.8/\\$module ./svn-helper.php switch ^/branches/1.8/\\$module
- to switch an anonymous workingcopy to a developers one: - 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 chdir(dirname(__FILE__)); // go to EGroupware root
array_shift($args); // get ride of "merge" arg 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 // get xml log
$cmd = "svn log --verbose --xml ".implode(' ',$args); $cmd = "svn log --verbose --xml ".implode(' ',$args);
//echo $cmd; //echo $cmd;