Fix issue #1905. Merge doesn't URI-encode copyfrom URLs when adding files and directories.
Fix issue #1905. Merge doesn't URI-encode copyfrom URLs when adding files and
directories.

* libsvn_client/diff.c (merge_file_added, merge_dir_added): Ensure that
  the path part of the copyfrom_url is URI-encoded.

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

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