You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/01/30 23:08:46 UTC
svn commit: r904901 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
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)
Re: svn commit: r904901 -
/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Posted by Julian Foad <ju...@btopenworld.com>.
On Sun, 2010-01-31 at 00:20 +0200, Daniel Shahaf wrote:
> danielsh@apache.org wrote on Sat, 30 Jan 2010 at 22:08 -0000:
> > 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".
> >
>
> Specifically, this was found by fs-test:36:obliterate_1(). But the
> function I patched --- commit_obliteration_body() --- looks like it
> actually does something... I thought obliterate wasn't implemented for
> FSFS yet? And if that's the case, what *does* that function currently
> do?
I started to implement it before I worked on BDB. What you see there is
that early, incomplete attempt, and I probably need to throw it away and
start again.
> [1] I imagine the special build flags only enable the UI and public API
> bits of 'obliterate', though.
Correct. Only the UI, actually.
- Julian
Re: svn commit: r904901 -
/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
danielsh@apache.org wrote on Sat, 30 Jan 2010 at 22:08 -0000:
> 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".
>
Specifically, this was found by fs-test:36:obliterate_1(). But the
function I patched --- commit_obliteration_body() --- looks like it
actually does something... I thought obliterate wasn't implemented for
FSFS yet? And if that's the case, what *does* that function currently
do?
Thanks,
Daniel
[1] I imagine the special build flags only enable the UI and public API
bits of 'obliterate', though.