From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH 0/3] Expat and libxslt changes for core-updates Date: Mon, 13 Jun 2016 17:05:03 +0200 Message-ID: <87k2htceow.fsf@gnu.org> References: <20160608101016.GA20565@debian-netbook> <20160609164317.GA5540@jasmine> <20160609231935.GA14894@jasmine> <87bn3919oa.fsf@gnu.org> <20160611004927.GA1242@jasmine> <87lh2ajgqa.fsf@gnu.org> <20160613022048.GA21060@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCTQO-0000i9-OG for guix-devel@gnu.org; Mon, 13 Jun 2016 11:05:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCTQJ-0006B6-Pg for guix-devel@gnu.org; Mon, 13 Jun 2016 11:05:11 -0400 In-Reply-To: <20160613022048.GA21060@jasmine> (Leo Famulari's message of "Sun, 12 Jun 2016 22:20:48 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari skribis: > On Sun, Jun 12, 2016 at 10:26:53PM +0200, Ludovic Court=C3=A8s 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? >>=20 >> 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, =E2=80=98core-updates=E2=80=99 cycles would be shor= ter, so we wouldn=E2=80=99t have had to worry about (3) in the first place. Ludo=E2=80=99.