From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YGOgMo8hzF4aHAAA0tVLHw (envelope-from ) for ; Mon, 25 May 2020 19:50:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0B9fLo8hzF6hPwAAbx9fmQ (envelope-from ) for ; Mon, 25 May 2020 19:50:39 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 193DF940390 for ; Mon, 25 May 2020 19:50:38 +0000 (UTC) Received: from localhost ([::1]:53472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdJ7N-0006hl-G7 for larch@yhetil.org; Mon, 25 May 2020 15:50:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdJ7F-0006hG-88 for guix-devel@gnu.org; Mon, 25 May 2020 15:50:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55792) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdJ7E-000166-W8 for guix-devel@gnu.org; Mon, 25 May 2020 15:50:29 -0400 Received: from ti0006q161-2604.bb.online.no ([84.202.68.75]:38386 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jdJ7E-0007ZP-GB for guix-devel@gnu.org; Mon, 25 May 2020 15:50:28 -0400 From: Marius Bakke To: guix-devel@gnu.org Subject: Re: Heads-up: hard reset of the 'staging' branch In-Reply-To: <87ftbn7r7r.fsf@gnu.org> References: <87ftbn7r7r.fsf@gnu.org> Date: Mon, 25 May 2020 21:50:25 +0200 Message-ID: <87d06r7q0u.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list 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+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -0.61 X-TUID: 3YvNIs1pLn6g --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > I have pushed a 'staging2' branch where I did the following: > > 1) git rebase -i --rebase-merges 8229ce3116c1f522c7157ab2dcd50dc2d765686= a~ > > 2) Moved 8229ce3116c1f522c7157ab2dcd50dc2d765686a after > f00270d35a6ca814903a9392caedc29d44959088 (the first merge that includes > .guix-authorizations) -- it was "one step down" in Magits interactive > rebase menu. > > 3) "solved" three merge conflicts (actually git rerere remembered the > resolutions, and I could have used git rebase --rerere-autoupdate to > make the process entirely automatic). > > I intend to move the current 'staging' branch to 'staging-old', and > rename 'staging2' to 'staging' once I'm fully confident in the result > and resolution. Of course I sent this before actually testing the branch! 'git rerere' had forgotten a very important merge resolution from 354880e7209a2aec0360dfe5b08b1873c084e2dd: the "tzdata-for-tests" package needs to be kept on version 2019c during that merge to prevent a full rebuild via "python". I will do a new rebase tomorrow and make sure each of the merges are correct. Meanwhile, do not pull 'staging2' unless you are freezing and the=20 computer is your main heat source. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7MIYEACgkQoqBt8qM6 VPqDWwgAkDR9OU0QseXP+507g4a15vFm9t5V8d4k1QfrBly9tSck+SS2VC3bnKEI wG4YuEhbuWrNJj2vMnGmB+Gd5zHa6CBJjrgmEdPeVP9W4grrW3e0W5X8kkQwjFSt MBTD+G17Xb2CQTvF+G+mbYMHBgxm3DlPv0MykfkdbMNs9duhC7V9cZDAYXvVuI4v T01tNbKjmnentzuAYqYfeFkOtN43sQA80WcjPuYNFNEYgckh6SAvBNa5sKvHVuwT +XhhXC2Ab3nYS/noAi0pEtXJiTEVWlQXEcRxjfNkWm9i8sckeSoKX2y18piK0jW3 +W+YCxGosLNdJxa2193WRfrr+wOThQ== =VgfI -----END PGP SIGNATURE----- --=-=-=--