Commit an intermediate step in removing some entries and access batons.
Commit an intermediate step in removing some entries and access batons.

* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_entry): Don't use the provided entry's conflict
    information, just fetch said information using a wc_db API.

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