Re: Potential regression: high server-side memory consumption during import

Philip Martin <philip_at_codematters.co.uk> writes:

> Stefan Sperling <stsp_at_elego.de> writes:
>
>> I think our best course of action is to revert the change on trunk
>> and in 1.10.x. Could you do that? (I could do it, too. I'm just asking
>> you since you've probably already prepared it in a local copy.)
>
> OK, r1825778.
>
> Hmm, it doesn't merge cleanly into 1.10...

r1825778 contains a revert of a change not in 1.10, so doesn't merge
cleanly to 1.10. The reverse merge of -c-r1779188,-1778923 from trunk
does merge cleanly to 1.10.

-- 
Philip