sussman@tigris.org writes:
> Author: sussman
> Date: Thu Sep 11 18:02:53 2003
> New Revision: 7050
>
> Modified:
> trunk/subversion/include/svn_wc.h
> trunk/subversion/libsvn_client/externals.c
> trunk/subversion/libsvn_wc/adm_ops.c
> trunk/subversion/libsvn_wc/log.c
> trunk/subversion/libsvn_wc/update_editor.c
> trunk/subversion/tests/clients/cmdline/update_tests.py
> Log:
> Fix issue #1196: 'svn up' deletions are now 'obstructed' by local mods.
> Modified: trunk/subversion/libsvn_wc/adm_ops.c
> ==============================================================================
> --- trunk/subversion/libsvn_wc/adm_ops.c (original)
> +++ trunk/subversion/libsvn_wc/adm_ops.c Thu Sep 11 18:02:53 2003
> @@ -1742,36 +1746,24 @@
> {
> apr_pool_t *subpool = svn_pool_create (pool);
> apr_hash_index_t *hi;
> + svn_wc_entry_t *incomplete_entry
> + = apr_pcalloc (pool, sizeof (*incomplete_entry));
No need for incomplete_entry to be dynamically allocated or zeroed,
just use
svn_wc_entry_t incomplete_entry;
> Modified: trunk/subversion/libsvn_wc/log.c
> ==============================================================================
> --- trunk/subversion/libsvn_wc/log.c (original)
> +++ trunk/subversion/libsvn_wc/log.c Thu Sep 11 18:02:53 2003
> @@ -592,17 +593,13 @@
> else if (entry->kind == svn_node_file)
> {
> err = svn_wc_remove_from_revision_control (loggy->adm_access, name,
> - TRUE,
> + TRUE, /* destroy */
> + TRUE, /* instant_error */
> NULL, NULL,
> loggy->pool);
> }
> -
> - /* It's possible that locally modified files were left behind during
> - the removal. That's okay; just check for this special case. */
> - if (err && (err->apr_err == SVN_ERR_WC_LEFT_LOCAL_MOD))
> - svn_error_clear (err);
> - else if (err)
> - return err;
> +
> + return err;
>
> /* (## Perhaps someday have the client print a warning that "locally
> modified files were not deleted" ?) */
I think this comment is redundant now. There's an extra return
statement at the end of this function as well.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 12 15:22:33 2003