On 10/6/07, Charles Acknin <charlesacknin@gmail.com> wrote:
> [[[
> Index: subversion/libsvn_client/patch.c
> ===================================================================
> --- subversion/libsvn_client/patch.c (revision 26952)
> +++ subversion/libsvn_client/patch.c (working copy)
> @@ -33,6 +33,7 @@
> #include "svn_base64.h"
> #include "svn_string.h"
> #include "svn_hash.h"
> +#include "svn_iter.h"
> #include <assert.h>
>
> #include "svn_private_config.h"
> @@ -514,7 +515,7 @@
> /* Passing NULL for the notify_func and notify_baton because
> delete_entry() will do it for us. */
> err = svn_client__wc_delete(mine, parent_access, patch_b->force,
> - patch_b->dry_run, FALSE, NULL, NULL,
> + patch_b->dry_run, TRUE, NULL, NULL,
> patch_b->ctx, subpool);
> if (err && state)
> {
> @@ -746,7 +747,7 @@
> SVN_ERR(svn_wc_adm_retrieve(&parent_access, adm_access, parent_path,
> subpool));
> err = svn_client__wc_delete(path, parent_access, patch_b->force,
> - patch_b->dry_run, FALSE,
> + patch_b->dry_run, TRUE,
> merge_delete_notify_func, &mdb,
> patch_b->ctx, subpool);
> if (err && state)
> @@ -820,6 +821,12 @@
> svn_wc_notify_func2_t notify_func;
> void *notify_baton;
>
> + /* The list of paths of schedule-delete entries. All file disk
> + * deletions are held until the patch application is entirely done --
> + * close_edit(). This is to prevent copyfrom files to be missing when
> + * involved in copy or move operations. */
> + apr_hash_t *deletions;
Oops, and since we're not doing any lookup in this version, the hash
table is overkill and I'll make use of apr_array instead.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 6 18:24:17 2007