[OpenLayers-Commits] r11166 - in sandbox/cmoullet/openlayers: . tools

[commits-20090109 at openlayers.org]

Author: cmoullet
Date: 2011-02-21 02:44:35 -0800 (Mon, 21 Feb 2011)
New Revision: 11166

Modified:
   sandbox/cmoullet/openlayers/
   sandbox/cmoullet/openlayers/tools/update_dev_dir.sh
Log:
Merge with trunk



Property changes on: sandbox/cmoullet/openlayers
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11163
   + /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11165

Modified: sandbox/cmoullet/openlayers/tools/update_dev_dir.sh
===================================================================
--- sandbox/cmoullet/openlayers/tools/update_dev_dir.sh	2011-02-21 10:39:07 UTC (rev 11165)
+++ sandbox/cmoullet/openlayers/tools/update_dev_dir.sh	2011-02-21 10:44:35 UTC (rev 11166)
@@ -2,11 +2,9 @@
 
 # Used to update http://openlayers.org/dev/ 
 
-svn revert -R /osgeo/openlayers/docs/dev
-svn up /osgeo/openlayers/docs/dev
 
 # Get current 'Last Changed Rev'
-REV=`svn info /osgeo/openlayers/docs/dev/ | grep 'Revision' | awk '{print $2}'`
+REV=`svn info http://svn.openlayers.org/ | grep 'Revision' | awk '{print $2}'`
 
 # Get the last svn rev
 touch /tmp/ol_svn_rev
@@ -14,6 +12,8 @@
 
 # If they're not equal, do some work.
 if [ ! o$REV = $OLD_REV ]; then
+    svn revert -R /osgeo/openlayers/docs/dev
+    svn up /osgeo/openlayers/docs/dev
 
     cd /osgeo/openlayers/docs/dev/tools/ 
     python exampleparser.py