aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/merge.sh
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2012-01-27 16:36:36 +0000
committerArtur Signell <artur.signell@itmill.com>2012-01-27 16:36:36 +0000
commitd472d9e1438a2b07d00279b7e8f77e2ca071e844 (patch)
treec96d82c29ac224362dbe6928810b91bf5a0e9bfb /scripts/merge.sh
parentf315689eff49ca84e1af75a2005dc28a7477b549 (diff)
downloadvaadin-framework-d472d9e1438a2b07d00279b7e8f77e2ca071e844.tar.gz
vaadin-framework-d472d9e1438a2b07d00279b7e8f77e2ca071e844.zip
User SVN_USER and SVN_PASS if given
svn changeset:22807/svn branch:6.8
Diffstat (limited to 'scripts/merge.sh')
-rwxr-xr-xscripts/merge.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/merge.sh b/scripts/merge.sh
index 775bc6a839..4ee58f0b90 100755
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -24,7 +24,13 @@ msg="[merge from $FROM] $msg"
if [ "$AUTOCOMMIT" = "autocommit" ]
then
echo "Trying to commit..."
- svn commit -m "$msg"
+ if [ "$SVN_USER" != "" ]
+ then
+ svn commit -m "$msg" --username $SVN_USER --password $SVN_PASS
+ else
+ svn commit -m "$msg"
+ fi
+
RET=$?
if [ "$RET" != "0" ]
then