diff options
Diffstat (limited to 'scripts/merge.sh')
| -rwxr-xr-x | scripts/merge.sh | 8 |
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 |