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

Karl Fogel wrote:

>Branko ÄŒibej <brane@xbc.nu> writes:
>
>
>>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.
>>
>>
>
>Okay... I'm worried, though, that we're going to go adding
>conditionals here and there to compensate for a notification call path
>that itself is temporary (i.e., that will go away when our use of
>svn_client_copy in merge goes away, when we solve this with libsvn_wc
>instead).
>
>Is that happening here? Are we in danger of piling cruft upon cruft?
>
Oh no, if it's true that "svn cp" has the same problem, then the
conditional in add_directly will be semantically the same as the one in
close_file.

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