summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/merge.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/merge.sh b/scripts/merge.sh
index 08b555f858..40423691e8 100755
--- 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/\/[^\/]*$//"`