Implement the Pristine Store version of one more function, conditional on SVN_EXPERIMENTAL_PRISTINE.
Implement the Pristine Store version of one more function, conditional on
SVN_EXPERIMENTAL_PRISTINE.

* subversion/libsvn_wc/update_editor.c
  (merge_file): Add a comment about the Pristine Store version.
  (svn_wc_add_repos_file4): Calculate both MD-5 and SHA-1 checksums of the
    new text base, and install it in the Pristine Store.


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

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