Replace an access baton, path, and base name with a wc_db and absolute path.
Replace an access baton, path, and base name with a wc_db and absolute path.

* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_node): Take an absolute path and wc_db, and use
    them instead of the access baton.
  (resolve_found_entry_callback): Don't fetch an access baton, since we
    no longer need it.

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