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.


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

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