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 775bc6a8391a20067130e0acc5558631b60c8cbf..4ee58f0b901e37d6c24e3a0fe8cc1a1df6f2cad0 100755 (executable)
--- 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