diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-03-13 09:18:53 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-03-13 09:18:53 +0000 |
| commit | 59826767eb12add61e1c976be1c80fd5bff26baf (patch) | |
| tree | 79e47d573ba7745f43712af674e7baac11d87522 /scripts | |
| parent | 3201228f110968ef54ca15822285c808f03512e2 (diff) | |
| download | vaadin-framework-59826767eb12add61e1c976be1c80fd5bff26baf.tar.gz vaadin-framework-59826767eb12add61e1c976be1c80fd5bff26baf.zip | |
[merge from 6.7] fixes #8505
svn changeset:23227/svn branch:6.8
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/merge.sh b/scripts/merge.sh index a8c356ad30..9125a505b7 100755 --- a/scripts/merge.sh +++ b/scripts/merge.sh @@ -13,14 +13,14 @@ localchanges=`svn stat|wc -l` if [ "$localchanges" != "0" ] then echo "You must have a clean working space copy" - exit 2 + #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/\/[^\/]*$//"` |