Re: [PATCH 0/3] Expat and libxslt changes for core-updates

[Leo Famulari <leo@famulari.name>]

On Sun, Jun 12, 2016 at 10:26:53PM +0200, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > On Fri, Jun 10, 2016 at 02:59:49PM +0200, Ludovic Courtès wrote:
> >> Leo Famulari <leo@famulari.name> skribis:
> >> > The merge will probably be messy...
> >> 
> >> We should leave it to you, to minimize breakage.
> >
> > Okay, should I do it today or is core-updates frozen?
> 
> It’s OK if you do it today.  :-)
> 
> The branch is being built but it’s just the beginning.

Okay, I've done it. I spent so much time thinking about this merge that
I am confident it's correct, but I'm nervous because I can't feasibly
build it as a test.

`make` succeeded.

> Sorry, I explained myself poorly.  Here, we (1) grafted Expat in master,
> (2) upgraded Expat in core-updates, and (3) only after that did we merge
> master in core-updates, making the merge more troublesome, right?
> 
> My question was whether we should swap (2) and (3).

Yes, I think we should do (3) before (2), if we notice (1).

Although (2) preceded (1) chronologically, in this case.

(2) happened circa Mar 25 and (1) happened circa May 18, according to
the dates on the commits.

So, swapping (2) and (3) wouldn't have helped this case.