Re: svn commit: rev 2219 - trunk/subversion/libsvn_wc

[Ben Collins-Sussman <su...@collab.net>]

sussman@tigris.org writes:

> Author: sussman
> Date: 2002-06-14 19:40 GMT
> New Revision: 2219
> 
> Modified:
>    trunk/subversion/libsvn_wc/merge.c
> Log:
> 
> 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>.

Josef -- the patch you submitted is beautiful, including its log
message... thank you for that!  However, your patch was a way of
preventing the de-translated file from being created in the .svn area,
which only solved the symptom of the bug, not the root cause.  The
root cause was that svn_wc_merge was wrongly assuming that all three
files were sitting in the same directory, and thus passing bogus
basenames to svn_io_run_diff3.  It no longer attempts to pass
basenames now.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org