Leo Famulari <l...@famulari.name> skribis: > On Sun, Jun 12, 2016 at 10:26:53PM +0200, Ludovic Courtès wrote:
[...] >> 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. OK. In an ideal world, ‘core-updates’ cycles would be shorter, so we wouldn’t have had to worry about (3) in the first place. Ludo’.
