From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 6PeaJfx5ZWZTfgEAA41jLg (envelope-from ) for ; Sun, 09 Jun 2024 11:46:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id QN4jIvx5ZWYyfAEA62LTzQ (envelope-from ) for ; Sun, 09 Jun 2024 11:46:36 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717926396; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=JBi6rybswILqVCykUE2TP4m3oU0SX6N16k4XdXAKjBs=; b=TQtBOB4WIpX3eqqx5zFdktiv5P9vqsigjn7JgoHGUaODwoE8qH2xzI47UGFbw155Hgquvt zHOtyhIr2WnjBxtX7s/6uLlkgTeaiGLecntr80CHRaCY6gn21MEjhaFvYWlJbyj45nbYKp /84JUrwxkGsnQ+hVJBq0kVsYlo7RjZxX8uEVZPpJFngDR/HDbaEws4i4dZAXJ0NqU1kFXe 4ZRPWY/ZEAlb1HhZbHeXkEcyxw+ZIPtM+7Q4/cnBluSDBxjy1tAAxQUT1Y5GMlYNXbrIH2 KR+g0O30Qcmd85+4Rl3etjn4CnnRZEh0nlmWYNvYwSc3CoTLod7ILGdHfvi82g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717926396; a=rsa-sha256; cv=none; b=f9K9Bt4z+TKC7HLPk4bCY6jOCgswxeKfU+2P2h+TLUf4NBer/+rz+f/Zp0x8PnH1v/S/Ch JSuV0VKcspItdyFKhS4niJQwWHyfn7sN8CuOWHKmTO7knSBhYjawd0Wq5Z2CIEIEFhqz3m B7Z77cG1ObDZbltN+rIdOP+iPJ+MLInkCiyXOVE2jMhmWyzKqgmiB8w0mNILRrtkQz4Wx/ fT7R2nXc5CPyR7QmYcRdLdUVI0bLGr8gxDHX/1l/kfldm0LQN5oqv3ne2qWS6comjXNeM+ XatN4LYHOzu0O2rauFWC10rKCzl96lxpbCo4YP309nQZFBOFMj4ek3HBJ71kaQ== 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 6DCA2124E2 for ; Sun, 9 Jun 2024 11:46:36 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sGF80-0000T3-OQ; Sun, 09 Jun 2024 05:46:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sGF7x-0000S5-6Z for guix-devel@gnu.org; Sun, 09 Jun 2024 05:46:17 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sGF7v-0008V4-Bj for guix-devel@gnu.org; Sun, 09 Jun 2024 05:46:16 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 10D0527BBE2; Sun, 9 Jun 2024 10:46:13 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a5d40817; Sun, 9 Jun 2024 09:46:12 +0000 (UTC) From: Christopher Baines To: guix-devel@gnu.org, Efraim Flashner , 70456@debbugs.gnu.org Subject: Re: branch core-updates updated (c8c6883398 -> 0e06c9697a) In-Reply-To: <171792086189.17847.16499633131068637226@vcs2.savannah.gnu.org> (guix-commits@gnu.org's message of "Sun, 9 Jun 2024 04:14:22 -0400 (EDT)") References: <171792086189.17847.16499633131068637226@vcs2.savannah.gnu.org> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Sun, 09 Jun 2024 10:46:10 +0100 Message-ID: <87jziy1mal.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.94 X-Spam-Score: -6.94 X-Migadu-Queue-Id: 6DCA2124E2 X-Migadu-Scanner: mx13.migadu.com X-TUID: IZ++7FyTMiwX --=-=-= Content-Type: text/plain guix-commits@gnu.org writes: > efraim pushed a change to branch core-updates > in repository guix. > > from c8c6883398 gnu: dico: Add libxcrypt dependency. > new 9804f8c149 gnu: coeurl: Update to 0.3.1. > new 51c7b6d76f gnu: font-gnu-freefont: Build with newer fontforge. > new 0e06c9697a gnu: Remove fontforge-20190801. > > The 3 revisions listed above as "new" are entirely new to this > repository and will be described in separate emails. The revisions > listed as "add" were already present in the repository and have only > been added to this reference. These changes confused me as I was looking at the trying to work out why they needed to be pushed to core-updates. Eventually I figured out that Git is right, these commits are entirely new, but they duplicate existing commits already pushed to master (e.g. 0e06c9697a is a duplicate of 3d5f4b2d7dda). I know the new guidance says to "Avoid merging master in to the branch", but one of the reasons for that is to avoid situations just like this where merges are done incorrectly and commits are duplicated between branches. To fix this, I think we should rebase core-updates on master and drop these commits. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZleeJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcjMxAArwbYGwBczYAsqb1OsRC58fC9vJd+lBLV eopXKjghcwEai0gm6J10s7KnIneIm9M6ety1TX6ELvUl4qHrj+FFi5hZTaneqcxs +axs3SYCcZ+HWqL1lH03hGVFLJosZ273944JJxAUiCi5iRR5CbffKcukyqCt7dHG p90M/60aDr2hsVBWj4EN3kzR5EyO9Pg3zBLJEilJ6pbokbnrxy3gGjXUtIN89fTE 9ZVkWAn52GUFYNPzNnBUEz89DgNqlcavL3oGSwuG6x6ge8q9LrHHC/5zlyhif1iO 8blg5RxO2tZfta6OEP2HfOz3ewJCyjoi7OWjKJ6Z38RGECTaLq5ZU+FNkLp/H0Lr J4MUGvC66XzQzCdH60SBdUtnCpgv3PqnodUBP8QXdzRJhvd24jCxVS2/76RML1Od HUih7PDwGqFa6DvSCkbekIGN+w910MtCTHhgdmVBr8/t9cBzhmYuqJ2TcC7yJfgI d+Ag8jOScFfweIX2yLYbQpsrKsJ50cjJz1d0cHkvBU5V11xt7sVKiBWSSHQYR9P+ pSd6gnscxbGq1HTEeIcZRzak5+8AH32CLC2pohuwwKU8ACaKSWhZwPQbuqb8Tp+3 GaYkjLb7208Thm5uMJt+1CxOy6bxTjquwxFjkl5i/1PnY5yMQj5QDWvH0MupM3GX wa8CFnqFbN8= =Cecn -----END PGP SIGNATURE----- --=-=-=--