Re: diff and merge behaviour [PATCH]

Ben Collins-Sussman wrote:

>Philip Martin <philip@codematters.co.uk> writes:
>
>
>
>>How about this? It might not be very efficient, when using ra_dav
>>calling svn_client_copy will open another session, and but it works.
>>
>>
>
>Ah, I see that instead of the merge process calling svn_client_add(),
>you're now having it call svn_client_copy(URL, wc-path).
>
>I have a simpler proposal though: you already *have* the file, and
>already know the copyfrom-path and copyfrom-rev. So go ahead and
>svn_client_add() the new file... and then tweak the entry, inserting
>the copyfrom* args. Voila, no network access, same result. :-)
>
>

+1, this is exactly what should be happening.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org