Represent replacements in the 'incoming delete' tree conflict details data structure by storing the node kind of the replacing node in there.
Represent replacements in the 'incoming delete' tree conflict details data
structure by storing the node kind of the replacing node in there.

While the information is now stored, it is not used yet.

* subversion/libsvn_client/conflicts.c
  (conflict_tree_incoming_delete_details,
   find_deleted_rev_baton): Add 'replacing_node_kind' field.
  (find_deleted_rev): Obtain replacing node kind from log item. This is not
   always available but it's the best we can do, for now, without adding
   another nested RA session in this RA callback (one such session is already
   used while searching for a youngest common ancestor).
  (conflict_tree_get_details_incoming_delete): Check for replacements in
   revisions which added a node and cause an incoming deletion during a
   reverse update/switch/merge operations.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1734041 13f79535-47bb-0310-9956-ffa450edef68

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