From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: Re: =?utf-8?B?4oCYY29yZS11cGRhdGVz?= =?utf-8?B?4oCZ?= merge is a squashed commit Date: Thu, 4 Aug 2016 14:40:32 +0200 Message-ID: <20160804124032.GA5789@solar> References: <20160803040446.GA23535@jasmine> <871t253ith.fsf@gnu.org> <20160803172417.GA10236@jasmine> <878twd20ui.fsf@gnu.org> <20160803183911.GC11621@jasmine> <87wpjxy4ta.fsf_-_@gnu.org> <20160803211032.GA6034@jasmine> <87a8gtyntw.fsf@netris.org> <20160804082400.GA1638@solar> <87ziosyalv.fsf@netris.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVHx4-0001O1-B3 for guix-devel@gnu.org; Thu, 04 Aug 2016 08:40:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVHwz-0001eN-T0 for guix-devel@gnu.org; Thu, 04 Aug 2016 08:40:41 -0400 Received: from mailrelay2.public.one.com ([91.198.169.125]:46971) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVHwz-0001eA-E9 for guix-devel@gnu.org; Thu, 04 Aug 2016 08:40:37 -0400 Content-Disposition: inline In-Reply-To: <87ziosyalv.fsf@netris.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: Mark H Weaver Cc: guix-devel@gnu.org On Thu, Aug 04, 2016 at 08:36:28AM -0400, Mark H Weaver wrote: > On my local machine, I did this successfully by first reverting a couple > of later commits, then reverting the squashed merge, then doing a proper > merge, and finally cherry-picking the later commits. I verified that > this sequence of operations made no changes to the tree. Good news, thanks for all this work! > Unfortunately, when I tried to push it to 'master', it was rejected > because of 56 unsigned commits on the 'core-updates' branch. Note that > all of the new commits I made (the reverts, the merge, and the > cherry-picks) were all signed by me. The unsigned commits that are > blocking this have been on the 'core-updates' branch for quite some > time. > > If there are unsigned commits on 'core-updates-next', I guess we'll run > into the same problem trying to merge that branch later. A possible solution would be to disable the commit hook that forces signatures, make these commits, and reenable the hook; hoping that noone adds an unsigned commit in the meantime... It would require to coordinate with a savannah administrator. Andreas