svn commit: r943178 - /ofbiz/branches/release10.04/mergefromtrunk.sh

[doogie-3]

Author: doogie
Date: Tue May 11 17:04:37 2010
New Revision: 943178

URL: http://svn.apache.org/viewvc?rev=943178&view=rev
Log:
If a merge fails for any reason, then abort the script.

Modified:
    ofbiz/branches/release10.04/mergefromtrunk.sh

Modified: ofbiz/branches/release10.04/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.sh?rev=943178&r1=943177&r2=943178&view=diff
==============================================================================
--- ofbiz/branches/release10.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release10.04/mergefromtrunk.sh Tue May 11 17:04:37 2010
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+set -e
 prevRev=`expr $1 - 1`
 svn merge -r $prevRev:$1 https://svn.apache.org/repos/asf/ofbiz/trunk 
 trunkLog=runtime/trunkLog.xml