On Sun, Oct 08, 2000 at 05:41:42PM -0000, Greg Hudson wrote:
...
>
> if (err && (err->apr_err != SVN_ERR_WC_ENTRY_NOT_FOUND))
> return err;
> - else if ((! adding) && (err->apr_err == SVN_ERR_WC_ENTRY_NOT_FOUND))
> + else if ((! adding) && err)
> return svn_error_quick_wrap (err, "trying to replace non-versioned file");
> - else if (adding && err)
> - return svn_error_quick_wrap (err, "trying to add versioned file");
> + else if (adding && !err)
> + return svn_error_create (0, SVN_ERR_WC_ENTRY_EXISTS, NULL,
> + parent_dir_baton->pool,
> + "trying to add versioned file");
>
> /* Make sure we've got a working copy to put the file in. */
> /* kff todo: need stricter logic here */
This ignores the error though, doesn't it? In this case, entry_get *is*
returning an error (though not ENTRY_NOT_FOUND), and 'adding' is true,
so none of the three branches is passing err back.
joe
Received on Sat Oct 21 14:36:10 2006