Add a simple heuristic to the conflict resolver which detects incoming moves.
Add a simple heuristic to the conflict resolver which detects incoming moves.

This is based on some code from the ancient moves-scan-log branch, which
was simplified a lot and now works in the context of the conflict resolver.

The implementation is currently very basic. It finds a move destination path
in the revision which deleted the node. No attempt is made to track additional
moves which may have moved the node somewhere else in future revisions within
the operative revision range. In other words, if a node was moved more than
once in a given revision range N:M, and -r N:M is merged, this heuristic
will display the destination of the first move, instead of the final move.

Move information is displayed in conflict descriptions but does not yet
have any effect on available resolution options. Still, this allows us
to play around and observe how well the heuristic works.

* subversion/libsvn_client/conflicts.c
  (repos_move_info): New data type. Local to this file. We'll never have
   to expose this. Instead, we'll make information available via the
   svn_client_conflict_* API as needed.
  (check_move_ancestry, find_move_for_deleted_node): New helper functions.
  (find_deleted_rev_baton, conflict_tree_local_missing_details,
   conflict_tree_incoming_delete_details,
   conflict_tree_incoming_add_details): Add 'move' member.
  (find_deleted_rev): Check for a move if a deleted revision is found.
  (find_revision_for_suspected_deletion): Return move information.
  (conflict_tree_get_details_local_missing): Initialize 'move' member.
  (describe_local_none_node_change,
   conflict_tree_get_description_local_missing,
   describe_incoming_deletion_upon_update,
   describe_incoming_deletion_upon_switch,
   describe_incoming_deletion_upon_merge): Show move information.
  (conflict_tree_get_details_incoming_delete,
   conflict_tree_get_details_incoming_add): Obtain move information.


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

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