From c8dbc2549267d3660a1cca04630391dc8d6fd014 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 2 Feb 2012 08:22:32 +0000
Subject: [PATCH] Optionally read password from file

svn changeset:22850/svn branch:6.8
---
 scripts/merge.sh | 5 +++++
 1 file changed, 5 insertions(+)

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/\/[^\/]*$//"`
-- 
2.39.5