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

Branko Čibej wrote:

> cmpilato@collab.net wrote:
>
>> I may be looking in the wrong place (got too many stackframes going
>> already to add another gdb session to it), but I just noticed that in
>> repos_diff.c, add_directory uses svn_wc_notify_add (which should do
>> the extra spaces), while close_file uses svn_wc_notify_update_add
>> (which should not).
>>
>>
>
> Nope, changing that bit doesn't help. Ah, I'll just go and debug this ...

Oh blimey! This was caused by a bug in the status parsing regex in
svntest.tree.build_tree_from_status... And here I've already made a
head-shaped dent in the wall. Doh!

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