cmpilato@tigris.org writes:
> --- OLD/trunk/subversion/libsvn_wc/adm_ops.c Tue Jan 15 09:30:12 2002
> +++ NEW/trunk/subversion/libsvn_wc/adm_ops.c Tue Jan 15 09:30:12 2002
> + svn_io_check_path (pristine_thing, &kind, pool);
> + if (kind == svn_node_file)
> + {
> + err = svn_io_copy_file (pristine_thing->data, thing->data, pool);
> + if (err)
> + return svn_error_createf
> + (err->apr_err, 0, NULL, pool,
> + "revert_admin_things: Error restoring props for `%s'",
> + full_path->data);
> + SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool));
> + entry->prop_time = tstamp;
> + }
> + else
> + {
> + apr_err = apr_file_remove (thing->data, pool);
> + if (apr_err)
> + return svn_error_createf
> + (apr_err, 0, NULL, pool,
> + "revert_admin_things: Error removing props for `%s'",
> + full_path->data);
> + }
Maybe use svn_io_remove_file() in the `else' case?
> @@ -914,6 +927,7 @@
> {
> rmfile = svn_stringbuf_dup (parent_dir, pool);
> svn_path_add_component (rmfile, rej_file, svn_path_local_style);
> +
> apr_err = apr_file_remove (rmfile->data, pool);
> if (apr_err)
> return svn_error_createf
Same, just change this to svn_io_remove_file()? May not even need the
`apr_err' variable, then...
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:56 2006