Re: [PATCH] Fix issue #1673 - svn merge reports File Not Found (single, unmodified,

"Marcos Chaves" <mchvs@hotmail.com> writes:

> - SVN_ERR (svn_io_remove_file (tmpfile1, pool));
> - SVN_ERR (svn_io_remove_file (tmpfile2, pool));
> + /* Ignore if temporary file not found. It may have been renamed. */
> + if ((err = svn_io_remove_file (tmpfile1, pool)) && (err->apr_err !=
> ENOENT))

Your mailer appears to have mangled the patch.

Don't check ENOENT explicitly, use APR_STATUS_IS_ENOENT instead.

> + {
> + return err;
> + }
> + if ((err = svn_io_remove_file (tmpfile2, pool)) && (err->apr_err !=
> ENOENT))
> + {
> + return err;
> + }

An svn_error_t cannot simply be abandoned, it must either be returned
or passed to svn_error_clear.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org