canvas::Layout: support for contents margins.

[simgear.git] / simgear / io / SVNDirectory.cxx

diff --git a/simgear/io/SVNDirectory.cxx b/simgear/io/SVNDirectory.cxx
index cc572fc11da25dff410a0125f1b544e9db760923..b1b57d531130b6c42da9dfd43adb8af3f0cff225 100644 (file)
--- a/simgear/io/SVNDirectory.cxx
+++ b/simgear/io/SVNDirectory.cxx
@@ -177,9 +177,6 @@ void SVNDirectory::writeCache()
 // approximately atomic delete + rename operation
     SGPath cacheName(localPath);
     cacheName.append(DAV_CACHE_NAME);
-    if (cacheName.exists()) {
-        cacheName.remove();
-    }
     p.rename(cacheName);
 }
 
@@ -247,8 +244,6 @@ void SVNDirectory::deleteChildByName(const std::string& nm)
     }
 
     SGPath path = fsDir().file(nm);
-    dav->removeChild(child);
-    delete child;
     
     if (child->isCollection()) {
         Dir d(path);
@@ -264,7 +259,10 @@ void SVNDirectory::deleteChildByName(const std::string& nm)
     } else {
         path.remove();
     }
-    
+
+    dav->removeChild(child);
+    delete child;
+
     writeCache();
 }
   
@@ -321,7 +319,6 @@ void SVNDirectory::mergeUpdateReportDetails(unsigned int depth,
     
     Dir d(localPath);
     if (depth >= MAX_UPDATE_REPORT_DEPTH) {
-        SG_LOG(SG_IO, SG_INFO, localPath << "exceeded MAX_UPDATE_REPORT_DEPTH, cleaning");
         d.removeChildren();
         return;
     }