Author: doogie
Date: Mon Sep 14 17:04:23 2009
New Revision: 814733
URL:
http://svn.apache.org/viewvc?rev=814733&view=revLog:
Should not have checked this in.
Modified:
ofbiz/branches/release09.04/mergefromtrunk.sh
Modified: ofbiz/branches/release09.04/mergefromtrunk.sh
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.sh?rev=814733&r1=814732&r2=814733&view=diff==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.sh Mon Sep 14 17:04:23 2009
@@ -1,5 +1,5 @@
#!/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