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 22:01:48 +0200 Message-ID: <87vazhzknn.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> <878twd20ui.fsf@gnu.org> <20160803183911.GC11621@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]:60127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bV2Ma-0008L9-Cx for guix-devel@gnu.org; Wed, 03 Aug 2016 16:02:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bV2MW-0000Ar-8j for guix-devel@gnu.org; Wed, 03 Aug 2016 16:01:59 -0400 In-Reply-To: <20160803183911.GC11621@jasmine> (Leo Famulari's message of "Wed, 3 Aug 2016 14:39:11 -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: >> > 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 >>=20 >> Yes, that=E2=80=99s annoying, but it=E2=80=99s a one-time transitional c= ost. > > Just to clarify, I would be re-signing (with my own key) and rebasing > all commits that were made on the master branch and merged on > core-updates-next, going back to sometime in June 2016. I think core-updates-next is just a dozen commits or so, right? > Whenever we merge this core-updates-next branch back into master, the > master branch's history will be rewritten, starting with aebd383d0. > Right? Or am I misunderstanding? I think we should remerge core-updates-next on top of master, making it the new core-updates. >From there on, we will not rebase core-updates and only do merges in that branch, as usual. > I tried it, to see what would happen. > > $ git rebase aebd383d04b351465cfb14e4fd0949b67d4b282e^ --exec "git commit= --amend --no-edit --gpg-sign" || git rebase --abort > > But for some reason, it ends up trying to work on commits from February > (starting at "build-system/gnu: Do not patch symlinks"), and then fails > to apply the commit that updates Python 2 to 2.7.11. Nothing should fail > to apply, since I'm not changing any files. Am I doing it wrong, or is > it a bug in Git? Perhaps some complication rebasing through previous > merges? Hmm. Perhaps the explanation is the merged commit that I screwed, which I=E2=80=99ll write about just now. Ludo=E2=80=99.