makl wrote:
> Version 2 of the patch.
>
> [[[
> Fix remaining part of issue 1751. File not switched if it is the same
> in source and destination.
>
> Patch from <makl@tigris.org>
>
> * subversion/tests/clients/cmdline/switch_tests.py
> (main): Remove XFAIL from nonrecursive_switching.
It is called 'test_list', not 'main'.
> (nonrecursive_switching): Extend the test to ensure that
> subdirectories are not switched.
>
> * subversion/libsvn_wc/adm_ops.c
> (tweak_entries): Change of non_recursively_tweak_entries to be
> non recursiv if it is necessary.
It looks like it is 'recursively_tweak_entries' that was changed and renamed. The pool usage was also changed. Perhaps write it like this:
* subversion/libsvn_wc/adm_ops.c
(tweak_entries): Rename from 'recursively_tweak_entries'. Add a
'recurse' flag so that recursion is optional. Fix pool usage.
> (svn_wc__do_update_cleanup): Call tweak_entries.
> ]]]
> Index: subversion/libsvn_wc/adm_ops.c
> ===================================================================
> --- subversion/libsvn_wc/adm_ops.c (revision 9193)
> +++ subversion/libsvn_wc/adm_ops.c (working copy)
> @@ -98,19 +101,18 @@
> if (base_url)
> child_url = svn_path_url_add_component (base_url, name, subpool);
>
> - /* If a file, or deleted or absent dir, then tweak the entry but
> - don't recurse. */
> + /* If a file, or deleted or absent dir in recursive mode, then tweak the
> + entry but don't recurse. */
> if ((current_entry->kind == svn_node_file)
> - || current_entry->deleted
> - || current_entry->absent)
> + || (recurse && (current_entry->deleted || current_entry->absent)))
> {
> SVN_ERR (svn_wc__tweak_entry (entries, name,
> child_url, new_rev, &write_required,
> svn_wc_adm_access_pool (dirpath)));
> }
>
> - /* If a directory... */
> - else if (current_entry->kind == svn_node_dir)
> + /* If a directory and recursiv... */
"recursive"
The rest of the patch looks OK.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 23 13:02:04 2004