On Tue, Apr 26, 2011 at 5:38 PM, <rhuijben_at_apache.org> wrote:
> Author: rhuijben
> Date: Tue Apr 26 21:38:34 2011
> New Revision: 1096921
>
> URL: http://svn.apache.org/viewvc?rev=1096921&view=rev
> Log:
> Remove the last bit of working copy obstruction detection from the repository
> diff editor.
>
> This patch makes the merge editor aware of the list of added directories to
> allow dry run property merges to directories.
>
> * subversion/libsvn_client/merge.c
> (merge_cmd_baton_t): Add hashtable of merge added paths.
> (dry_run_added_p): New function.
> (perform_obstruction_check): Specialize handling of merge-added paths.
> (merge_dir_props_changed): Don't perform actual prop merging for added
> directories when doing a dry-run merge.
> (merge_file_added,
> merge_dir_added,
> merge_dir_deleted,
> merge_dir_closed): Don't set optional output arguments to their default.
>
> * subversion/libsvn_client/repos_diff.c
> (close_directory): When an obstruction is noticed, update the content state
> and use updated notifications.
>
> * subversion/tests/cmdline/merge_tree_conflict_tests.py
> (tree_conflicts_merge_edit_onto_missing,
> tree_conflicts_merge_del_onto_missing): Expect more skip notifications.
>
> * subversion/tests/cmdline/tree_conflict_tests.py
> (at_directory_external): Mark as XFail again. This change moves the failure
> to where we step into the external for the first time. The merge code
> detects this properly now, but wants to apply mergeinfo on the external
> to notice that it wasn't merged. But it can't and shouldn't store this
> information.
Fixed the failing tree_conflict test in r1097598.
Paul
Received on 2011-04-28 22:24:59 CEST