From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UBYwI07ViGTrDwAASxT56A (envelope-from ) for ; Tue, 13 Jun 2023 22:45:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id UAQzI07ViGQ6VgAA9RJhRA (envelope-from ) for ; Tue, 13 Jun 2023 22:45:02 +0200 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 4B3591B62E for ; Tue, 13 Jun 2023 22:45:02 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8hMg-0000Wl-VT; Mon, 12 Jun 2023 09:13:46 -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 1q8hMb-0000WQ-7Y for guix-devel@gnu.org; Mon, 12 Jun 2023 09:13:42 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8hMY-00011b-LS for guix-devel@gnu.org; Mon, 12 Jun 2023 09:13:40 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 3E6E9C28; Mon, 12 Jun 2023 15:13:28 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cGjJylyjU7Ru; Mon, 12 Jun 2023 15:13:27 +0200 (CEST) Received: from jurong (unknown [147.210.21.1]) by hera.aquilenet.fr (Postfix) with ESMTPSA id B59C21B6; Mon, 12 Jun 2023 15:13:27 +0200 (CEST) Date: Mon, 12 Jun 2023 15:13:26 +0200 From: Andreas Enge To: Felix Lechner Cc: Maxim Cournoyer , Christopher Baines , guix-devel@gnu.org Subject: Re: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] Message-ID: References: <168610879676.2825.9044237296073582277@vcs2.savannah.gnu.org> <20230607033317.826FCC23EDC@vcs2.savannah.gnu.org> <87sfb31qqp.fsf@cbaines.net> <87wn0aadrb.fsf@gmail.com> <87352xady4.fsf@gmail.com> <87y1kp8q11.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=2a0c:e300::1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686689102; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=nbGKwRgfrPlfDkjFsM6iyoqS2LQJEoTmlGMFOV3qb5Y=; b=HEFCN/jlI8Rv7tQ1phgJ38vStgPo6IpApUkFFzHwTEZt13OZTuBvw1sPPYy0sPR0uJPU3e qNYq3GzA1F1ZJvdjxCgMmzagsi5JfkwvTzvnWJyivLDiSl9jw5IPfE0ubz6O0rK8KCCRiG kcrBwPsB4IM0pUQpvqiSUdOFuFfpU4ECqfZ4Fyy4ZYzQhOzWlY6P1bd8TpCMsMJn92iwFM NVyB7kAqgIjlzRIizOecwfPLKQKm2oCGtvF5CDi2JRu/5M/XaqsagN5XJgAnE9PntCrLKO P5Il48KJsWXDVaLLpTgZGdIDMu+i5ItFclG6tz11qOk3ar7uog9zhoC1BB7KbQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686689102; a=rsa-sha256; cv=none; b=Mfh1vLHxMyraGo81fWliu8/xCIYzr63W81HCyoaWngNvIHIaUpzdOI7E0XsKU8lyX7kQG7 9/JyESGIJpwS5E5uQ2Nt3bbEz9qKZdRBrEcrCIPi6R0c513ns3Pap1R6zuTh2UgcKQE3+N adb/Vek+jEUcy1fgoV7NY61nQcDVtUBaL92r9oszo8uYxL1tt2q9DugsOgOG+jauh48rCF 3kaSfQ1jVe/s9rplf5KhSba88YvI1Xrg90XMFDQOjoCjhgh69P52OBm2RJUPLcAwI0iUFA /9B0rtsHFA8SZyy0G4njJ8NMxN1GIn1PItZGV6HfkWK2gplwKopEVZ3shJgWGg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.02 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" X-Migadu-Queue-Id: 4B3591B62E X-Spam-Score: -0.02 X-TUID: 1N/b2Pc1F8tU Hello, Am Sun, Jun 11, 2023 at 06:10:37PM -0700 schrieb Felix Lechner: > That was probably a misunderstanding. I meant to suggest with some > trepidation that 'master' is merged into the feature branch, and then > the feature branch is merged back into 'master'. I thought the two > merge commits would be signed by the person performing the merges > while the "origin seal" of the accepted change is also preserved. indeed, that is what we had been doing with the very long lived staging and core-updates branches in the past. Well, we used to repeatedly merge the master branch to core-updates, which if I remember well makes the master commits end up first in "git log". So the core-updates specific commits gradually disappear below thousands of master commits. So this is a problem. But Maxim is right about signatures, sorry for forgetting them time and again! One policy would be to *not* merge master back to the feature branch (or maybe just before merging the feature branch to master). This would work well for short-lived branches. Andreas