From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: =?utf-8?Q?=E2=80=98core-updates=E2=80=99?= merge is a squashed commit Date: Thu, 04 Aug 2016 08:36:28 -0400 Message-ID: <87ziosyalv.fsf@netris.org> References: <20160802174821.GA29590@jasmine> <874m7297xg.fsf@gnu.org> <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> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVHtF-0008Nw-Pp for guix-devel@gnu.org; Thu, 04 Aug 2016 08:36:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVHtC-000127-Aq for guix-devel@gnu.org; Thu, 04 Aug 2016 08:36:45 -0400 Received: from world.peace.net ([50.252.239.5]:39215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVHtC-000123-6P for guix-devel@gnu.org; Thu, 04 Aug 2016 08:36:42 -0400 In-Reply-To: <20160804082400.GA1638@solar> (Andreas Enge's message of "Thu, 4 Aug 2016 10:24:00 +0200") 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: Andreas Enge Cc: guix-devel@gnu.org Andreas Enge writes: > On Thu, Aug 04, 2016 at 03:50:51AM -0400, Mark H Weaver wrote: >> How about reverting the squashed commit and then re-doing a proper merge >> from 'core-updates-2016-08-01' into 'master'? > > If this is possible without too many complications, that sounds like a good > option; the earlier the better, probably, before there are too many new > conflicts. Hm, I just tried the revert part, and it already creates a conflict. 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. 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. Mark