Avoid unlink of an open file.

Works on Unix, not so great on Windows it turns out. Thanks to Jasin
and Geoff for figuring this out in the end.

diff --git a/simgear/io/SVNDirectory.cxx b/simgear/io/SVNDirectory.cxx
index a4ef9bc5247786342417551bb9ae001575de790a..267d312094f4a11044ad8b7cab90e4b076fbe306 100644 (file)
--- a/simgear/io/SVNDirectory.cxx
+++ b/simgear/io/SVNDirectory.cxx
@@ -136,7 +136,7 @@ void SVNDirectory::parseCache()
         _cachedRevision = versionName;
         doneSelf = true;
       } else {
-        DAVResource* child = addChildDirectory(hrefPtr)->collection();
+        DAVResource* child = parseChildDirectory(hrefPtr)->collection();
           string s = strutils::strip(versionName);
           if (!s.empty()) {
               child->setVersionName(versionName);
@@ -235,6 +235,17 @@ SVNDirectory::addChildDirectory(const std::string& dirName)
     return child;
 }
 
+SVNDirectory*
+SVNDirectory::parseChildDirectory(const std::string& dirName)
+{
+    assert(!dav->childWithName(dirName));
+    DAVCollection* childCol = dav->createChildCollection(dirName);
+    SVNDirectory* child = new SVNDirectory(this, childCol);
+    childCol->setVersionName(child->cachedRevision());
+    _children.push_back(child);
+    return child;
+}
+
 void SVNDirectory::deleteChildByName(const std::string& nm)
 {
     DAVResource* child = dav->childWithName(nm);

diff --git a/simgear/io/SVNDirectory.hxx b/simgear/io/SVNDirectory.hxx
index 68bca1b008b0e1384b3cff9d2736e1ce1e8be10b..1d7122cc6735f621ae69dacc56785af3a71dc2a6 100644 (file)
--- a/simgear/io/SVNDirectory.hxx
+++ b/simgear/io/SVNDirectory.hxx
@@ -91,7 +91,8 @@ private:
   void writeCache();
   
   DirectoryList::iterator findChildDir(const std::string& dirName);
-      
+  SVNDirectory* parseChildDirectory(const std::string& dirName);
+
   SGPath localPath;
   DAVCollection* dav;
   SVNRepository* repo;