From: <mg...@us...> - 2008-11-03 04:01:48
|
Revision: 2355 http://planeshift.svn.sourceforge.net/planeshift/?rev=2355&view=rev Author: mgist Date: 2008-11-03 04:01:46 +0000 (Mon, 03 Nov 2008) Log Message: ----------- - Merged r2230 from trunk. Modified Paths: -------------- stable/tools/jobber.cfg stable/tools/svnwrapper Property Changed: ---------------- stable/ Property changes on: stable ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Xordan:1745,1812,1894 /trunk:1-2108,2110,2112,2114,2116-2119,2121,2123-2124,2126,2128,2130,2132-2133 + /personal/Xordan:1745,1812,1894 /trunk:1-2108,2110,2112,2114,2116-2119,2121,2123-2124,2126,2128,2130,2132-2133,2230 Modified: stable/tools/jobber.cfg =================================================================== --- stable/tools/jobber.cfg 2008-11-02 18:23:29 UTC (rev 2354) +++ stable/tools/jobber.cfg 2008-11-03 04:01:46 UTC (rev 2355) @@ -116,7 +116,7 @@ # must allow "write" access to the repository if files are to be committed # back to the repository. No default. #------------------------------------------------------------------------------ -$jobber_svn_base_url = "http://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk"; +$jobber_svn_base_url = "https://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk"; #------------------------------------------------------------------------------ # $jobber_svn_flags [optional] Modified: stable/tools/svnwrapper =================================================================== --- stable/tools/svnwrapper 2008-11-02 18:23:29 UTC (rev 2354) +++ stable/tools/svnwrapper 2008-11-03 04:01:46 UTC (rev 2355) @@ -5,14 +5,16 @@ # checkout it also runs a number of updates afterwards to # compensate for SFs sometimes broken SVN. +eval adress=\$$# + MAXITER=2 if [[ "$1" == "co" || "$1" == "checkout" ]] then # First do a normal checkout, pass on all options to SVN # Then if it fails, do at most MAXITER updates - DIRNAME=`basename $2` - + DIRNAME=`basename $adress` + svn $@ if [[ $? ]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |