Fix a bug in do_single_file_merge() that shows up in certain "merge of a file replacement" scenarios.
Fix a bug in do_single_file_merge() that shows up in certain "merge of
a file replacement" scenarios.

* subversion/libsvn_client/merge.c
  (do_single_file_merge): Reset the adm_access baton passed into this
    function to one associated with the direct parent of the merge
    target file.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion