Revert part of my r919403: take the entry-modify statements out of the new install_text_base() function and put them back in the two call sites.  The first caller updates BASE_NODE and the second WORKING_NODE, so both will need separate new code for directly using WC_DB to replace the entry changes.
Revert part of my r919403: take the entry-modify statements out of the new
install_text_base() function and put them back in the two call sites.  The
first caller updates BASE_NODE and the second WORKING_NODE, so both will
need separate new code for directly using WC_DB to replace the entry
changes.

Suggested by: rhuijben

* subversion/libsvn_wc/update_editor.c
  (install_text_base): Remove the entry-modifying parts from here ...
  (merge_file, svn_wc_add_repos_file4): ... and put them back here.

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