Rewrite a function to remove the use of an access baton and relative paths. In the process, use absolute paths elsewhere in surrounding code.
Rewrite a function to remove the use of an access baton and relative paths.
In the process, use absolute paths elsewhere in surrounding code.

* subversion/libsvn_wc/merge.c
  (detranslate_wc_file): Don't use an adm_access baton, but a db and absolute
    paths.
  (merge_text_file): Rename a parameter to reflect its absolute-ness.
  (merge_binary_file): Rename a parameter to reflect its absolute-ness, and
    also do a deep compare instead of comparing pointers
  (svn_wc__merge_internal): Fetch appropriate absolute paths and update caller
    to detranslate_wc_file().

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