In the merge code use the obstruction information obtained from
perform_obstruction_check for the whole tree conflict detection for nodes
that are assumed to exist before an operation, instead of partially relying
on the on-disk information which we already compared.

* subversion/libsvn_client/merge.c
  (check_moved_away,
   check_moved_here): Move above the first diff callback.

  (merge_dir_props_changed): Handle moved_away reason.

  (check_moved_away,
   check_moved_here): Move above the first diff callback.

  (merge_file_deleted,
   merge_dir_deleted): Use the already available information for the
    obstruction/tree conflict check. Use local_abspath for path variable.


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