[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: r10454 - in branches/1.1.x: . subversion/libsvn_fs
From:       maxb () tigris ! org
Date:       2004-07-31 22:30:15
Message-ID: 200407312230.i6VMUFM13481 () morbius ! ch ! collab ! net
[Download RAW message or body]

Author: maxb
Date: Sat Jul 31 17:30:07 2004
New Revision: 10454

Modified:
   branches/1.1.x/STATUS
   branches/1.1.x/subversion/libsvn_fs/fs-loader.c
Log:
Merge r10405 from trunk to 1.1.x branch.

Make sure to use BDB for BDB-specific operations.

Approved by: +1: ghudson, brane, lundblad


Modified: branches/1.1.x/STATUS
Url: http://svn.collab.net/viewcvs/svn/branches/1.1.x/STATUS?view=diff&rev=10454&p1=branches/1.1.x/STATUS&r1=10453&p2=branches/1.1.x/STATUS&r2=10454
 ==============================================================================
--- branches/1.1.x/STATUS	(original)
+++ branches/1.1.x/STATUS	Sat Jul 31 17:30:07 2004
@@ -19,12 +19,6 @@
     Votes:
       +3: brane. That should be enough :-)
 
-  * r10405:
-    Make sure to use BDB for BDB-specific operations.
-    Justification: Fixes embarassing crashes when built without BDB.
-    Votes:
-      +1: ghudson, brane, lundblad
-
   * r10386, r10388:
     Add IRI support and URI ato-escaping (issue #1910).
     Justification: Nice usability feature, which could go in if we restart

Modified: branches/1.1.x/subversion/libsvn_fs/fs-loader.c
Url: http://svn.collab.net/viewcvs/svn/branches/1.1.x/subversion/libsvn_fs/fs-loader.c \
?view=diff&rev=10454&p1=branches/1.1.x/subversion/libsvn_fs/fs-loader.c&r1=10453&p2=branches/1.1.x/subversion/libsvn_fs/fs-loader.c&r2=10454
 ==============================================================================
--- branches/1.1.x/subversion/libsvn_fs/fs-loader.c	(original)
+++ branches/1.1.x/subversion/libsvn_fs/fs-loader.c	Sat Jul 31 17:30:07 2004
@@ -168,7 +168,7 @@
   if (err && APR_STATUS_IS_ENOENT (err->apr_err))
     {
       svn_error_clear (err);
-      fs_type = DEFAULT_FS_TYPE;
+      fs_type = SVN_FS_TYPE_BDB;
     }
   else if (err)
     return err;
@@ -316,11 +316,11 @@
 {
   fs_library_vtable_t *vtable;
 
-  SVN_ERR (get_library_vtable (&vtable, DEFAULT_FS_TYPE, fs->pool));
+  SVN_ERR (get_library_vtable (&vtable, SVN_FS_TYPE_BDB, fs->pool));
 
   /* Create the FS directory and write out the fsap-name file. */
   SVN_ERR (svn_io_dir_make (path, APR_OS_DEFAULT, fs->pool));
-  SVN_ERR (write_fs_type (path, DEFAULT_FS_TYPE, fs->pool));
+  SVN_ERR (write_fs_type (path, SVN_FS_TYPE_BDB, fs->pool));
 
   /* Perform the actual creation. */
   return vtable->create (fs, path, fs->pool);
@@ -331,7 +331,7 @@
 {
   fs_library_vtable_t *vtable;
 
-  SVN_ERR (get_library_vtable (&vtable, DEFAULT_FS_TYPE, fs->pool));
+  SVN_ERR (get_library_vtable (&vtable, SVN_FS_TYPE_BDB, fs->pool));
   return vtable->open (fs, path, fs->pool);
 }
 
@@ -346,7 +346,7 @@
 {
   fs_library_vtable_t *vtable;
 
-  SVN_ERR (get_library_vtable (&vtable, DEFAULT_FS_TYPE, pool));
+  SVN_ERR (get_library_vtable (&vtable, SVN_FS_TYPE_BDB, pool));
   return vtable->delete_fs (path, pool);
 }
 
@@ -356,9 +356,9 @@
 {
   fs_library_vtable_t *vtable;
 
-  SVN_ERR (get_library_vtable (&vtable, DEFAULT_FS_TYPE, pool));
+  SVN_ERR (get_library_vtable (&vtable, SVN_FS_TYPE_BDB, pool));
   SVN_ERR (vtable->hotcopy (src_path, dest_path, clean_logs, pool));
-  SVN_ERR (write_fs_type (dest_path, DEFAULT_FS_TYPE, pool));
+  SVN_ERR (write_fs_type (dest_path, SVN_FS_TYPE_BDB, pool));
   return SVN_NO_ERROR;
 }
 
@@ -367,7 +367,7 @@
 {
   fs_library_vtable_t *vtable;
 
-  SVN_ERR (get_library_vtable (&vtable, DEFAULT_FS_TYPE, pool));
+  SVN_ERR (get_library_vtable (&vtable, SVN_FS_TYPE_BDB, pool));
   return vtable->bdb_recover (path, pool);
 }
 
@@ -377,7 +377,7 @@
 {
   fs_library_vtable_t *vtable;
 
-  SVN_ERR (get_library_vtable (&vtable, DEFAULT_FS_TYPE, fs->pool));
+  SVN_ERR (get_library_vtable (&vtable, SVN_FS_TYPE_BDB, fs->pool));
   return vtable->bdb_set_errcall (fs, handler);
 }
 
@@ -389,7 +389,7 @@
 {
   fs_library_vtable_t *vtable;
 
-  SVN_ERR (get_library_vtable (&vtable, DEFAULT_FS_TYPE, pool));
+  SVN_ERR (get_library_vtable (&vtable, SVN_FS_TYPE_BDB, pool));
   return vtable->bdb_logfiles (logfiles, path, only_unused, pool);
 }
 
@@ -807,7 +807,7 @@
   fs_library_vtable_t *vtable;
   svn_error_t *err;
 
-  err = get_library_vtable (&vtable, DEFAULT_FS_TYPE, pool);
+  err = get_library_vtable (&vtable, SVN_FS_TYPE_BDB, pool);
   if (err)
     {
       svn_error_clear(err);

---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]