I (Julian Foad) wrote: > On Tue, 2010-06-29, Neels J Hofmeyr wrote: > > Hi Julian, > > > > I heard you were changing things about update editor's add_file() copyfrom > > args. The thing is I have taken the liberty to look at add-vs-add tree > > conflicts and have a pretty nice improvement on that aalmost ready. > > > > Now I fear that our patches will clash and am curious. Can I see your patch? > > here is mine (there's still some amount of clutter around in it, don't be > > distracted by it -- update_editor.c is the point). > > > > Because the patch is quite unintelligible I've also attached my current > > update_editor.c. > > Hi Neels. Here is my patch. It's quite simple. I'll have a look at > yours and comment if necessary, but right now I'll say please just go > ahead with yours and I'll fit in around it.
Rats... my patch doesn't appear to do anything useful: the two externals-tests failures I thought it caused were due to another local change, and when I test it again it doesn't fix the errors I thought it fixed. - Julian
