Update the last few remaining places in the merge code to assume absolute paths instead of converting to them on every invocation.
Update the last few remaining places in the merge code to assume absolute
paths instead of converting to them on every invocation.

* subversion/libsvn_client/merge.c
  (obstructed_or_missing): Accept only absolute paths.
  (merge_props_changed): Pass absolute paths
  (merge_file_changed): Don't convert paths and update callers. Move
    file instead of copy + delete.
  (merge_file_added, merge_file_deleted, merge_dir_added,
   merge_dir_deleted): Assume absolute paths are passed.


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

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion