Move a DB-changing work-queue item up a couple of call levels, as a step towards replacing it with a direct DB update.
Move a DB-changing work-queue item up a couple of call levels, as a step
towards replacing it with a direct DB update.

* subversion/libsvn_wc/merge.c
  (preserve_pre_merge_files): Don't build a WQ item that updates the DB
    with the paths of the preserved files; instead, return the paths via new
    output parameters.
  (maybe_resolve_conflicts): Don't call preserve_pre_merge_files() if
    there's a conflict; let the caller do that.
  (merge_text_file): If maybe_resolve_conflicts() reports a conflict, call
    preserve_pre_merge_files() and then build a WQ item that updates the DB
    with the paths of the preserved files.

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