diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-03-13 09:42:58 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-03-13 09:42:58 +0000 |
| commit | 0681a2f396e69cd60238d0e77a2d857af5865252 (patch) | |
| tree | 24ea16ff5ed758dab42d2b0c9c95d7b3aee0605f /scripts | |
| parent | c62c3da5b633a8b4d1f5030abeec564572b041e9 (diff) | |
| download | vaadin-framework-0681a2f396e69cd60238d0e77a2d857af5865252.tar.gz vaadin-framework-0681a2f396e69cd60238d0e77a2d857af5865252.zip | |
Reverted accidental commit
svn changeset:23229/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 9125a505b7..a8c356ad30 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/\/[^\/]*$//"` |