From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 27 Jan 2012 16:36:36 +0000 (+0000)
Subject: User SVN_USER and SVN_PASS if given
X-Git-Tag: 7.0.0.alpha2~483^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d472d9e1438a2b07d00279b7e8f77e2ca071e844;p=vaadin-framework.git

User SVN_USER and SVN_PASS if given

svn changeset:22807/svn branch:6.8
---

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