Optionally read password from file

svn changeset:22850/svn branch:6.8

diff --git a/scripts/merge.sh b/scripts/merge.sh
index 08b555f8580b507e1d89b72839216c87ef9aab75..40423691e8b29a9b141cfe02c6e98097b34c18f3 100755 (executable)
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -16,6 +16,11 @@ then
        exit 2
 fi
 
+if [ "$SVN_PASS_FILE" != "" ]
+then
+       SVN_PASS=`cat "$SVN_PASS_FILE"`
+fi
+       
 svn up
 
 currentrepowithoutversion=`svn info|grep URL|sed "s/URL: //"|sed "s/\/[^\/]*$//"`