On Tue, Sep 29, 2009 at 05:41, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
>...
> +++ trunk/subversion/libsvn_wc/wc_db.c Tue Sep 29 02:41:40 2009 (r39666)
>...
> @@ -3294,17 +3297,22 @@ svn_wc__db_read_info(svn_wc__db_status_t
> }
> else
> {
> + svn_error_t *err2;
> if (have_work)
> - err = svn_sqlite__column_checksum(checksum, stmt_work, 2,
> - result_pool);
> + err2 = svn_sqlite__column_checksum(checksum, stmt_work, 2,
> + result_pool);
> else
> - err = svn_sqlite__column_checksum(checksum, stmt_base, 7,
> - result_pool);
> - if (err != NULL)
> - err = svn_error_createf(
> - err->apr_err, err,
> - _("The node '%s' has a corrupt checksum value."),
> - svn_dirent_local_style(local_abspath, scratch_pool));
> + err2 = svn_sqlite__column_checksum(checksum, stmt_base, 7,
> + result_pool);
> +
> + if (err2 != NULL)
> + err = svn_error_compose_create(
> + err,
> + svn_error_createf(
> + err->apr_err, err,
> + _("The node '%s' has a corrupt checksum value."),
> + svn_dirent_local_style(local_abspath,
> + scratch_pool)));
The CHILD_ERR parameter should be err2 here.
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2401708
Received on 2009-09-29 18:43:40 CEST