Re: [PATCH] Issue 838 merge should copy-with-history

cmpilato@collab.net wrote:

>Philip Martin <philip@codematters.co.uk> writes:
>
>
>
>>Can someone tell me what the merge feedback should be when merge
>>copies-with-history a directory tree. I gather that Karl thinks it
>>should be different from that for copy.
>>
>>
>
>Negative, should be the same. And both need to be fixed, it seems!
>And I wonder that one tweak to repos_diff.c would do the trick...
>
No. It would fix the merge and cp bug, but would introduce a bug in add
(on a directory).

Hmmmmm. Lemme see if I can make that bit conditional.

-- 
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