From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: core-updates merged! Date: Sat, 6 Aug 2016 10:42:22 -0400 Message-ID: <20160806144222.GA3949@jasmine> 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> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bW2oC-00057Q-Ir for guix-devel@gnu.org; Sat, 06 Aug 2016 10:42:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bW2o8-0007L8-D4 for guix-devel@gnu.org; Sat, 06 Aug 2016 10:42:39 -0400 Content-Disposition: inline In-Reply-To: <20160803040446.GA23535@jasmine> 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 =?iso-8859-1?Q?Court=E8s?= Cc: guix-devel@gnu.org On Wed, Aug 03, 2016 at 12:04:46AM -0400, Leo Famulari wrote: > On Tue, Aug 02, 2016 at 11:28:59PM +0200, Ludovic Courtès wrote: > > Leo Famulari skribis: > > Otherwise LGTM; could you push it to core-updates-next? > > I merged master into core-updates-next and made the change in a > subsequent commit. > > Unfortunately, I can't push the branch to Savannah because it contains > the following unsigned commits (one of them is mine, oops!): > > f21403e2b6f5a9491937a0cc9f31fc113998ce5e > 9bc84dfea9560c497c91863e7b5021860bd3c254 > 745ad37a780b28f72ac9dfcc8092317e577e51c9 > 2d74d94b17b23ab95072da68553d85ac0b3bfede > aebd383d04b351465cfb14e4fd0949b67d4b282e > > What should we do? This is still preventing me from starting the new core-updates branch. I guess that we should do the same thing we did when fixing the squashed merge: disable the assert-commit-signed hook temporarily for the push. It was also suggested to cherry-pick the 11 commits from core-updates-next onto master — essentially rebasing them. I can try that if everyone is okay with me re-signing those commits. > In the meantime, you can inspect the updated branch on my personal Git > repo: > https://github.com/lfam/guix/commits/core-updates-next Mark, if you want to do method that requires disabling the hook, feel free to take my (signed) work from this link. It will save you from doing a lot of merge conflict resolution.