From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GE8YEhczCGa1nQAA62LTzQ:P1 (envelope-from ) for ; Sat, 30 Mar 2024 16:43:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id GE8YEhczCGa1nQAA62LTzQ (envelope-from ) for ; Sat, 30 Mar 2024 16:43:19 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=mPrIn6ZO; 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=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711813399; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=kr9WucewlbE4gBmyrrnJ38NDfAtcj4rQ1u3IHnNMlns=; b=pNgfBDbDHoswu0S2E59PGL2UvpJj884WbU7boYBBt2eB7QJGxqDFuoCDT2zbvw/4lOr27J szIWzExX1g0jbXc9zNjEgz8l3zkM6fK4xcq+y/OfZ5A4HeafE4mltgJti6A8Pde1Mh2eOM xSjy5vtpYUMjeZIDoMIuKS8FjBM3EnM4+WqNKF3hh9t1wJstzmNIBu4h7RN8jwTn4b3/Ly M29ITgBrIwZSjyB8IHdCwfdKeaGhMfz5k7q8rq0j4SV24JmLA/6GHOopHyKrlKofzzt+xu yiXFfIkhLDl5qCpGxtreTvZZWTdoG/eG7Wq3PMWc/gq82FtmBPeci6g1guoelg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=mPrIn6ZO; 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=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711813399; a=rsa-sha256; cv=none; b=pf3FFMhF8yQ58SFC7THhRmK+oitMUszQc9BDmPsRw8NA5CjnGxPu3a13aC+O4Nc7qpawp+ nMFbZr12vKurKw2NgOgeptY3EzIhqkJTmcXCjjEPN9oDqmpj+zNglIevtO3PvT63jNx/VL BPM/nAIb/+QZizlBTnJejPlNZboFqWTGzMC+8b3gRrsmGGVBh1RsOGldBMYi40FoLxyzEM ij9nah+Nnx4K3mZFJ+67Os+js+6fpDq9KyL8JU4u9jp7IIHzTgAJyL7syW/mRqNrf2sqDV M+hiTyy9RM0zFYGZs6/Jak2jFMz3ehhseP82H0G5MLM3M5WE7x8cIDvdyyjbqQ== 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 DC1A34A9A for ; Sat, 30 Mar 2024 16:43:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqar4-0001F6-PZ; Sat, 30 Mar 2024 11:42:50 -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 1rqar0-0001Er-Jp for guix-devel@gnu.org; Sat, 30 Mar 2024 11:42:46 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqaqz-0007JI-4F for guix-devel@gnu.org; Sat, 30 Mar 2024 11:42:46 -0400 Received: by mail-lf1-x144.google.com with SMTP id 2adb3069b0e04-515c50dc2afso3062091e87.1 for ; Sat, 30 Mar 2024 08:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711813362; x=1712418162; darn=gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=kr9WucewlbE4gBmyrrnJ38NDfAtcj4rQ1u3IHnNMlns=; b=mPrIn6ZO+OD86VkNluTY+VJATeFvGZHFu6Oodf/TcAurycLGBJtBw4o2l6ZOzlD21T tZh7iuEQIwfw11Nrsdd5mvmjQlblaj0GqOmC3LD4VJCSCvs0uB5bdmQrHJbv2NpIoTbR 0u3nC3BHD6DEmKGMgKHkwpGJt4MEBfKExGe3nyvv+xo9jfAtDjaiInXyg6fPt2d3/jNa P8WFG31jTuPLTfZ/kyQ3EUZDVJPL0sEDkKmDgNB3gof3vB50YhI3cE+x7vqZgaPq3a9j FD+W8WahhLq4gR9x5lvNjM70h26HZ8WFPTllcPy1pyWLF5iwWLCnNEDGcQcEA5nh9gmH S+NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711813362; x=1712418162; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=kr9WucewlbE4gBmyrrnJ38NDfAtcj4rQ1u3IHnNMlns=; b=JZDk0azr9xqLkKjZw7kG202imJuz61S2enCmzCJbAVHG13qUzKz473j7FYF7u/BNc8 ZZIGo0gtTGSK/dWrPiTNMfdu+paBPgfSBvtSguOKU1G7rFL55I+pOD5U0cYjpakhoQSp qoy+Gepplc7kAhbI8DsVjW5XvGuu+K7ggKmzBh2iaeFGykuv5U+ncj9cc+PgeQ3xWuhy 7yb5xdfAy5HFnkoG1jVhM93iWu4Wnqoth84q7VaIwN+RzF3FwBAzQOxVt60Xptksv6OB IQIzADU9WbogwxkiCUNMopzJ9HHdb5D+t4t2h13j7U40u4Zk6pnzyyB0C58s1IaaOOXN 6TaQ== X-Gm-Message-State: AOJu0YwyJY675UpOj2DCjFTBgXnKGy+tsC9XKf8S6u+4aTmYDThY2u6o Swuc60hoB5WFVVE41nQi5+r4G2Jv9iH1j/gfI16zjtvESXLIxxTr X-Google-Smtp-Source: AGHT+IELMVIj8S6/Ui3s9l125s/7iB3oEB585k9Xxc2e7ozjPm7MCN+LE1Jyupj/9kSVJXRV+4rt8g== X-Received: by 2002:a05:6512:40d:b0:513:c195:1c56 with SMTP id u13-20020a056512040d00b00513c1951c56mr3540548lfk.16.1711813361841; Sat, 30 Mar 2024 08:42:41 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b20-20020aa7cd14000000b0056bf9b4ec32sm3412621edw.78.2024.03.30.08.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Mar 2024 08:42:41 -0700 (PDT) Message-ID: Subject: Re: Emacs and Gnome branches are merged now From: Liliana Marie Prikler To: Christopher Baines Cc: guix-devel@gnu.org Date: Sat, 30 Mar 2024 16:42:39 +0100 In-Reply-To: <875xx3sqpo.fsf@cbaines.net> References: <875xx3sqpo.fsf@cbaines.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::144; envelope-from=liliana.prikler@gmail.com; helo=mail-lf1-x144.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 X-Migadu-Queue-Id: DC1A34A9A X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -9.64 X-Spam-Score: -9.64 X-TUID: 2OPQYBGb0I46 Am Samstag, dem 30.03.2024 um 14:20 +0000 schrieb Christopher Baines: > I think the last merge of master in to gnome-team was pushed on the > 20th of March, with the merge of gnome-team in to master being pushed > today on the 30th. Good catch, I should have merged to gnome-team first and then merge to master. > Looking at those dates, it seems like bringing changes from master in > to branches more frequently, or at least just before considering > whether it's ready to merge (and merging if it is) would help to > avoid this. I did try to do weekly merges in the other direction, but it wasn't always so disciplined about them. Perhaps we should have a tighter process for merging, so that things don't get out of hand? Maybe document things in the manual as well? > 10 days is a long window in which changes can be pushed to master. QA > is meant to pick up when a branch has diverged from master, but the > mechanism is crude and the threshold it was using was very high. I've > now reduced it [1] so QA might warn in the future about this > situation. Good catch, that ought to encourage more pre-merge thinking. > While I don't think it's directly relevant, I think it's worth noting > that both changes mentioned above (usbutils and psmisc), we didn't > follow our own guidance on managing patches. psmisc affects more than > 300 dependent packages, and while I think that's less of an issue if > changes go through QA, I don't think either of these changes did. We don't even do this for webkit, which is a very annoying nuisance even if justified by its security nature. That's why we have grafts! Cheers