subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r904901 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Date Sat, 30 Jan 2010 22:08:46 GMT
Author: danielsh
Date: Sat Jan 30 22:08:45 2010
New Revision: 904901

URL: http://svn.apache.org/viewvc?rev=904901&view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
  (commit_obliteration_body):
    When obliterating a packed revision, error out gracefully instead of
    asserting.  This makes the C tests report "XFAIL" rather than "Aborted".

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=904901&r1=904900&r2=904901&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Sat Jan 30 22:08:45 2010
@@ -6065,7 +6065,11 @@
   apr_off_t changed_path_offset;
   char *buf;
 
-  SVN_ERR_ASSERT(! is_packed_rev(cb->fs, rev));
+  /* ### Someday support obliterating packed revisions. Maybe. */
+  if (is_packed_rev(cb->fs, rev))
+    return svn_error_create(SVN_ERR_FS_GENERAL, NULL,
+                            _("Obliteration of already-packed revision "
+                              "is not supported"));
 
   /* Get the next node_id and copy_id to use. */
   if (ffd->format < SVN_FS_FS__MIN_NO_GLOBAL_IDS_FORMAT)



Mime
View raw message