From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: Rebasing core-updates-next branch Date: Tue, 12 Jul 2016 11:35:48 +0200 Message-ID: References: <9cd9387c-589d-5bc2-475b-d12fd6c10ff5@gmail.com> <87mvlnkzf5.fsf@gnu.org> 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]:56599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMu6v-0003dg-0H for guix-devel@gnu.org; Tue, 12 Jul 2016 05:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMu6p-0001Gd-US for guix-devel@gnu.org; Tue, 12 Jul 2016 05:36:12 -0400 In-Reply-To: <87mvlnkzf5.fsf@gnu.org> 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: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org, alezost@gmail.com Ludovic Court=C3=A8s writes: > Hi! > > Manolis Ragkousis skribis: > >> Core-updates-next has not been updated for some time so I think it's >> time to do that. I was planning to rebase core-updates-next on >> core-updates and create a new core-updates-next. >> >> There is a problem though. Rebasing changes the pgp signature of the >> commit. The affected commits are the ones below. >> >> a08539d gnu: guile: Use "site-ccache" for the compiled search path. >> 14af4d1 build: Correctly determine the system type for GNU/Hurd system= s. >> 5b32f07 gnu: wrap-python3: Create more symlinks. >> 788eb97 gnu: sqlite: Update to 3.13.0. >> bd46fdc utils: Fix 'modify-phases' docstring. >> d35bc36 gnu: curl: Update to 7.49.1. >> 98e8dc6 packages: Use '--no-backup-if-mismatch' for patching. >> >> I have cc'ed the authors of those commits. If you are okay with it, I >> will sign those commits with my key and push the new core-udpates-next= . > > Fine with me! > > Ricardo Wurmus skribis: > >> Do we need to rebase? Is a merge not possible? > > I like to avoid unnecessary merge commits, but I could go either way in > this case. I guess you=E2=80=99d prefer merging? Either way is fine by me (and my commits are not affected here). I just think that it=E2=80=99s a bit unfortunate to throw away signatures. ~~ Ricardo