On Mon, Apr 12, 2010 at 11:19, <[email protected]> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Apr 12 15:19:23 2010
> @@ -7254,13 +7254,17 @@ svn_wc__db_get_pristine_md5(const svn_ch
> SVN_ERR(svn_sqlite__step(&have_row, stmt));
> if (!have_row)
> {
> - *md5_checksum = NULL; /* ### that's not what we want. Report an error
> - instead. */
> - return svn_error_return(svn_sqlite__reset(stmt));
> + *md5_checksum = NULL;
There is no need to worry about the OUT params if you throw an error.
> + SVN_ERR(svn_sqlite__reset(stmt));
> + return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
> + _("The pristine text with checksum '%s' was "
> + "not found"),
> + svn_checksum_to_cstring_display(sha1_checksum,
> +
> scratch_pool));
> }
You could write it as:
return svn_error_createf(ERR, svn_sqlite__reset(stmt), ...);
*shrug*
I don't think that error code is appropriate, however. I would suggest
either SVN_ERR_WC_DB_ERROR or creating a new code.
Cheers,
-g
