You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com> on 2008/11/14 23:02:03 UTC

Re: svn commit: r34209 - in trunk/subversion: libsvn_wc tests/cmdline tests/cmdline/svntest

2008-11-14 23:45:28 sbutler@tigris.org napisaƂ(a):
> Author: sbutler
> Date: Fri Nov 14 14:45:27 2008
> New Revision: 34209
> 
> Log:
> If update or switch skips a conflicted tree, don't set the new
> revision, URL, etc. on anything in the conflicted tree.
> 
> On updating or switching a prop-conflicted directory, skip the
> directory and its descendants as we do for tree conflicts.
> 
> This is a follow-up to the skip-conflicts improvements in r34158.
> 
> * subversion/libsvn_wc/adm_ops.c
>   (tweak_entries): When finishing an update or switch, skip all
>    descendants of an excluded path.
> 
> * subversion/libsvn_wc/update_editor.c
>   (edit_baton): Note in comments the new (recursive) meaning of the
>    skipped_paths field.  Rename current_tree_conflict to
>    current_conflict to reflect that it may contain the path of a
>    prop-conflicted dir.
>   (complete_directory,
>    do_entry_deletion,
>    add_directory,
>    close_directory,
>    add_file,
>    open_file,
>    make_editor): Track field renames.
>   (open_directory): Track field renames. Ensure that an existing
>    property conflict causes the dir tree to be skipped.
> 
> * subversion/tests/cmdline/switch_tests.py
>   (tree_conflicts_on_switch_2_1,
>    tree_conflicts_on_switch_3): Expected status shows old revision
>    numbers.  Now consistent with the other tests.
> 
> * subversion/tests/cmdline/update_tests.py
>   (update_delete_modified_files,
>    update_conflicted): Expected output and status show improved
>    skipping and old revision numbers.
>   (tree_conflicts_on_update_2_1,
>    tree_conflicts_on_update_2_3,
>    tree_conflicts_on_update_3): Expected status shows old revision
>    numbers.  Now consistent with the other tests.
> 
> * subversion/tests/cmdline/svntest/actions.py
>   (deep_trees_skipping_on_update): Check status before the skipping,
>    too.  Comment out a print statement (whoops).
> 
> Modified:
>    trunk/subversion/libsvn_wc/adm_ops.c
>    trunk/subversion/libsvn_wc/update_editor.c
>    trunk/subversion/tests/cmdline/svntest/actions.py
>    trunk/subversion/tests/cmdline/switch_tests.py
>    trunk/subversion/tests/cmdline/update_tests.py
> ...
> Modified: trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/update_editor.c?pathrev=34209&r1=34208&r2=34209
> ==============================================================================
> --- trunk/subversion/libsvn_wc/update_editor.c	Fri Nov 14 14:21:00 2008	(r34208)
> +++ trunk/subversion/libsvn_wc/update_editor.c	Fri Nov 14 14:45:27 2008	(r34209)
> ...
> @@ -1533,7 +1535,8 @@ already_in_a_tree_conflict(char **victim
>    while (! svn_path_is_empty(ancestor))
>      {
>        SVN_ERR(svn_wc_adm_probe_open3(&ancestor_access, NULL, ancestor,
> -                                     FALSE, 0, NULL, NULL, pool));
> +                                     FALSE, 0, cancel_func, cancel_baton,
> +                                     pool));
>  
>        if (ancestor_access == NULL)
>          break;

This change isn't described in the log message.

-- 
Arfrever Frehtes Taifersar Arahesis