Another "stop using the adm access baton as a surrogate for the dir_abspath" change.
Another "stop using the adm access baton as a surrogate for the dir_abspath"
change.

* subversion/libsvn_wc/update_editor.c
  (merge_props): Add parameters for the wc_db and dir_abspath, and use them
    internally.
  (loggy_tweak_entry): Same.
  (merge_file, svn_wc_add_repos_file4): Update callers.

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