On the 'resolve-incoming-add' branch, implement tree conflict support in the diff processor.
On the 'resolve-incoming-add' branch, implement tree conflict support
in the diff processor.

* subversion/libsvn_client/conflicts.c
  (raise_tree_conflict): New helper function. If you want to record a new
   tree conflict, go here.
  (merge_newly_added_dir_baton): Add repos_root_url, repos_uuid,
   added_repos_relpath, merge_left_rev, and merge_right_rev.
   All of these are needed to record a tree conflict.
  (diff_dir_added, diff_dir_changed, diff_dir_deleted,
   diff_file_added, diff_file_changed, diff_file_deleted): Record a tree
    conflict if the expected node kind is not found.


git-svn-id: 06eecb4ca38db91321c34a31bb4012790c9e075d@1762908 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion