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 03:50:51 -0400 Message-ID: <87a8gtyntw.fsf@netris.org> References: <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> <87wpjxy4ta.fsf_-_@gnu.org> <20160803211032.GA6034@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]:48984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVDQq-0005oU-D3 for guix-devel@gnu.org; Thu, 04 Aug 2016 03:51:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVDQm-0006IF-30 for guix-devel@gnu.org; Thu, 04 Aug 2016 03:51:07 -0400 In-Reply-To: <20160803211032.GA6034@jasmine> (Leo Famulari's message of "Wed, 3 Aug 2016 17:10:32 -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 writes: > On Wed, Aug 03, 2016 at 10:29:21PM +0200, Ludovic Court=C3=A8s wrote: >> In fact, commit 455859a50f88f625d13fc2f304111f02369b366b, which is the >> core-updates merge, is *not* a merge commit. Instead it seems to be a >> squashed commit of all of core-updates. Consequently, part of the >> history of the files touched by this merge is squashed into this single >> pseudo-merge commit. :-/ > > Dang, that means we lost the commit history of core-updates. It won't be > in the Git log. For now, I pushed my most recent copy of the lost 'core-updates' branch to Savannah as 'core-updates-2016-08-01', to make sure it's not lost. >> This can be fixed locally with a graft to give the merge commit the two >> parents it is supposed to have: >>=20 >> git replace --graft 455859a50f88f625d13fc2f304111f02369b366b \ >> 742effef5629667b274087adc70b06abab86b252 a8cb87abe98d57fb763d5b1452= 4dc32c96bd31b5=20 How about reverting the squashed commit and then re-doing a proper merge from 'core-updates-2016-08-01' into 'master'? Mark