diff --git a/contrib/ChangeLog b/contrib/ChangeLog index caa477ccd3f14309cbcff3a6dff475f7267541d9..d3417e623fc81986f3a87a97282362e8af3c347b 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2005-11-03 Steven Bosscher <stevenb@suse.de> + + * gcc_build: Fix my previous checking. + 2005-11-01 Joseph S. Myers <joseph@codesourcery.com> * gcc_update: Include revision number in LAST_UPDATED. diff --git a/contrib/gcc_build b/contrib/gcc_build index 7ad2484e2164974836ebd7b536aad6b5d41113dc..899ae3ecd08116c71693cb491f255240c2c56a71 100755 --- a/contrib/gcc_build +++ b/contrib/gcc_build @@ -201,7 +201,8 @@ SVN_SERVER="gcc.gnu.org" # The path to the repository on that server. SVN_REPOSITORY="/svn/gcc/" # The branch to check out from that server. -SVN_BRANCH="trunk" +# Defaults to trunk if no branch is defined with -b. +SVN_BRANCH="" # The SVN protocol to use. SVN_PROTOCOL="svn" # The username to use when connecting to the server. @@ -285,7 +286,9 @@ if [ ${CHECKOUT} -eq 0 ] && test -n "${SVN_BRANCH}"; then fi # Validate the branch name. -if test "${SVN_BRANCH}" != "trunk"; then +if test -n "${SVN_BRANCH}"; then + SVN_BRANCH="trunk"; +else SVN_BRANCH="branches/${SVN_BRANCH}"; fi