
Fix bug #712, a big fat P1 issue.
  ("svn_wc_merge fails on files with eol/keyword translation").

This bug was discovered & diagnosed by Josef Wolf <jw@raven.inka.de>.

* merge.c (svn_wc_merge): the tmp_left & tmp_right copies of left &
  right must be created as unique-files that are clones of
  *tmp_target*, not merge_target.  Normally merge_target ==
  tmp_target, so we'd never seen this bug till attempting to merge a
  translated file.  When merge_target is de-translated into some
  tmp_target in.svn/tmp/, the other inputs are now created in the same
  administrative area.  At that point, there's no need to pass
  basenames of these 3 files to svn_io_run_diff3 anymore; they're all
  relative paths below merge_target's parent, which is all that
  svn_io_run_diff3 requires in the first place.  We can run
  svn_io_run_diff3 in "." from now on, since all input paths should
  now be relative to "." as well.

  Everyone follow that?  :-)


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

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