Resolve issue #3405, by making the merge code properly install pristine
properties for directories added by the merge. Before this patch the pristine
properties list of such a directory would be empty while the repository would
assume it had the list like before the 'copy'. The commit would then just
commit the property changes as if the directory was really changed.

* subversion/include/private/svn_wc_private.h
  (svn_wc__complete_directory_add): New function.

* subversion/libsvn_client/merge.c
  (merge_dir_props_changed): For an added directory the properties should be
    installed, not processed as incomming property changes.

* subversion/libsvn_wc/update_editor.c
  (svn_wc__complete_directory_add): New function. Using the infrastructure
    also used by the update editor and svn_wc_add_repos_file4() to process
    entry properties in what the wc_db api expects.

* subversion/tests/cmdline/merge_tests.py
  (no_self_referential_filtering_on_added_path,
   merge_with_added_subtrees_with_mergeinfo ): Mark now Failing tests as
    work in progress, until the needed changes are carefully reviewed.

  (merge_properties_on_adds): Remove XFail marker.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1438767 13f79535-47bb-0310-9956-ffa450edef68