From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: core-updates merged! Date: Wed, 03 Aug 2016 19:56:05 +0200 Message-ID: <878twd20ui.fsf@gnu.org> References: <20160801081958.GA2211@solar> <87lh0ggnyt.fsf@gnu.org> <87invje1yx.fsf@we.make.ritual.n0.is> <87invj84bc.fsf@gnu.org> <20160802174821.GA29590@jasmine> <874m7297xg.fsf@gnu.org> <20160803040446.GA23535@jasmine> <871t253ith.fsf@gnu.org> <20160803172417.GA10236@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]:33896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bV0Os-0004Cl-IB for guix-devel@gnu.org; Wed, 03 Aug 2016 13:56:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bV0Oo-0005SJ-EQ for guix-devel@gnu.org; Wed, 03 Aug 2016 13:56:14 -0400 In-Reply-To: <20160803172417.GA10236@jasmine> (Leo Famulari's message of "Wed, 3 Aug 2016 13:24:17 -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 Wed, Aug 03, 2016 at 06:42:34PM +0200, Ludovic Court=C3=A8s wrote: >> I think you should start from the pre-merge =E2=80=98core-updates-next= =E2=80=99, sign >> commits that are unsigned (I thought Manolis signed them all on the last >> rebase?), then merge, and finally push. > > Unfortunately, signing old commits causes subsequent history to be > rewritten, and the subsequent signatures are lost. I would have to > re-sign commits all the way back to June (for aebd383). And Git users' > local history would become invalid. Yeah, but despite lacking the =E2=80=98wip-=E2=80=99 prefix as we usually d= o, this branch was =E2=80=9Crebaseable=E2=80=9D, so I think it=E2=80=99s OK. Hopefully that will no longer happen in the future. > I think we are hitting something like the problem I warned about here: > http://lists.gnu.org/archive/html/guix-devel/2016-07/msg01220.html Yes, that=E2=80=99s annoying, but it=E2=80=99s a one-time transitional cost. Thanks! Ludo=E2=80=99.