Switch the working file installation for another case in the update process. But we also have to be wary of major ugliness around file externals, which appear to be placing the database into an improper state for a period of time.
Switch the working file installation for another case in the update
process. But we also have to be wary of major ugliness around file
externals, which appear to be placing the database into an improper state
for a period of time.

* subversion/libsvn_wc/update_editor.c:
  (merge_file): take an INSTALL_FROM parameter to indicate where the
    working copy file install (ref: INSTALL_PRISTINE) will occur from. use
    this new install process for another scenario, but be wary of file
    externals, which are (currently) monkeyed up from a database standpoint.
  (close_file): pass INSTALL_FROM to merge_file, and use it for the
    working copy file install process. we can't clean the file up just
    yet, since it may refer to the revert base, but future conditions
    should be able to do the removal.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@931798 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion