diff options
| author | Artur Signell <artur.signell@itmill.com> | 2012-02-02 08:22:32 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2012-02-02 08:22:32 +0000 |
| commit | c8dbc2549267d3660a1cca04630391dc8d6fd014 (patch) | |
| tree | 70ce5a38bf2a0cc4e0e6ee7cd4dabba4d3ef0f82 /scripts | |
| parent | 5f5a0ac89695f25a7aa79a013a90f0595aced240 (diff) | |
| download | vaadin-framework-c8dbc2549267d3660a1cca04630391dc8d6fd014.tar.gz vaadin-framework-c8dbc2549267d3660a1cca04630391dc8d6fd014.zip | |
Optionally read password from file
svn changeset:22850/svn branch:6.8
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/merge.sh | 5 |
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/\/[^\/]*$//"` |