From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ANZjL/D6fWP67AAAbAwnHQ (envelope-from ) for ; Wed, 23 Nov 2022 11:50:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8ItUL/D6fWOULAAAauVa8A (envelope-from ) for ; Wed, 23 Nov 2022 11:50:24 +0100 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 685FD8E43 for ; Wed, 23 Nov 2022 11:50:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxnKO-0001wQ-UU; Wed, 23 Nov 2022 05:50:05 -0500 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 1oxnKM-0001vw-SW for guix-patches@gnu.org; Wed, 23 Nov 2022 05:50:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxnKM-0003S5-D3 for guix-patches@gnu.org; Wed, 23 Nov 2022 05:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oxnKM-0007HG-9W for guix-patches@gnu.org; Wed, 23 Nov 2022 05:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59513] [PATCH] doc: contributing: Tweak the Commit Policy. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Nov 2022 10:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59513@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166920059227944 (code B ref -1); Wed, 23 Nov 2022 10:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Nov 2022 10:49:52 +0000 Received: from localhost ([127.0.0.1]:53815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxnKB-0007Ge-Og for submit@debbugs.gnu.org; Wed, 23 Nov 2022 05:49:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:33296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxnKA-0007GS-Nk for submit@debbugs.gnu.org; Wed, 23 Nov 2022 05:49:51 -0500 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 1oxnKA-0001uw-8R for guix-patches@gnu.org; Wed, 23 Nov 2022 05:49:50 -0500 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxnK8-0003Qi-C0 for guix-patches@gnu.org; Wed, 23 Nov 2022 05:49:50 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 4266227BBE9 for ; Wed, 23 Nov 2022 10:49:47 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 4ddf9277 for ; Wed, 23 Nov 2022 10:49:47 +0000 (UTC) From: Christopher Baines Date: Wed, 23 Nov 2022 10:49:46 +0000 Message-Id: <20221123104946.29480-1-mail@cbaines.net> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1669200624; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=g69eAOzekvvOYnrdaD9B3F3hvAVCXn+MpgjHKqsixzg=; b=QiF2FIQNgMjM8NT5o6vlyIcJfin7Z3vqaT6yocpQq60aMsa+g3ati4kFqg/GBkhAS0Z5t/ oz6MAvr+I6mj2xoWD/R6kTpeKTKyBUhMRR/3BJX5Y/7OQn5lheoVAEi2+tatcoQHC9/IYR v1DqhHlTtO6YaBsheCEPd5nJN3GWpJlLKP0NNyeMjq11W85bl4aHfUDfArpVC9Hk6KDAVQ 5+E54BaqGQwVBNqUR0L2pOOUMk3H4bQ16YihXJIZEkmmK4ovOz+9foJBJ97wWpmUTtZDKB QypRosoZON/G7a8iJiV24kU/CXfCvGOHnBqF8KPuM9J0o/xsEwVmMUxBRCamcQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669200624; a=rsa-sha256; cv=none; b=HWDatom3t/anIMnuoxkD+Ivkgu3WgxySW6qBaT0LEjaWQixhT0JZNdvKljAAcF+R9VxodM k7sMpQBXnaVkvP8qMXgflFWoXq9zMCw/xthZsvzlhQsR/bIDa3VRM2pxDTbvkLR6F53WL9 1MhQceWoOPUz7+Tx2R2Dua5P45+TM2Hp51N+kEBKBrnjkUQNj5d1E2H81CfwRpB95s0L9X ER2xu9TFPW62L/HAJ2T2HYa4wD6UI9CSZX6rU3cUSbMDP3s1a72+7+bT3EFyVspBw1k66i w27mrNX8WdQp1ygM5qwQawMqDBUo6jxGbFNP+KMpGvYt1Dq7TmBbWsqO8NnoBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.69 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 685FD8E43 X-Spam-Score: -0.69 X-Migadu-Scanner: scn1.migadu.com X-TUID: MAcrLqi6xZnJ Add more examples of when it can be appropriate to push changes without review, as I think this can be appropriate in the case of trivial changes (as mentioned before), but also non-trivial fixes. No longer suggest pushing simple new packages or package upgrades (that don't cause lots of rebuilds) without sending to guix-patches. Now there's some automation for testing changes sent to guix-patches, sending changes there before pushing can mean that more rigerious testing takes place and help speed up substitutes becoming available. This is true, even if no human review takes place. Only suggest waiting one week for review for simpler changes, wait two weeks for more significant changes. Also, reorder some of the information in this section so it's grouped together better. * doc/contributing.texi (Commit Policy): Tweak. --- doc/contributing.texi | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 40ae33ecac..6f772961ea 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1819,23 +1819,25 @@ It additionally calls @code{make check-channel-news} to be sure @subsection Commit Policy -If you get commit access, please make sure to follow -the policy below (discussions of the policy can take place on +If you get commit access, please make sure to follow the policy below +(discussions of the policy can take place on @email{guix-devel@@gnu.org}). -Non-trivial patches should always be posted to -@email{guix-patches@@gnu.org} (trivial patches include fixing typos, -etc.). This mailing list fills the patch-tracking database -(@pxref{Tracking Bugs and Patches}). +For a minority of changes, it can be appropriate to push them directly +without sending them for review. This includes both trivial changes +(e.g. fixing typos) but also reverting problomatic changes and +addressing regressions. -For patches that just add a new package, and a simple one, it's OK to -commit, if you're confident (which means you successfully built it in a -chroot setup, and have done a reasonable copyright and license -auditing). Likewise for package upgrades, except upgrades that trigger -a lot of rebuilds (for example, upgrading GnuTLS or GLib). We have a -mailing list for commit notifications (@email{guix-commits@@gnu.org}), -so people can notice. Before pushing your changes, make sure to run -@code{git pull --rebase}. +In general though, all changes should be posted to +@email{guix-patches@@gnu.org}. This mailing list fills the +patch-tracking database (@pxref{Tracking Bugs and Patches}). Leave time +for a review, without committing anything (@pxref{Submitting Patches}). +If you didn’t receive any reply after one week (two weeks for more +significant changes), and if you're confident, it's OK to commit. + +That last part is subject to being adjusted, allowing individuals to +commit directly on non-controversial changes on parts they’re familiar +with. When pushing a commit on behalf of somebody else, please add a @code{Signed-off-by} line at the end of the commit log message---e.g., @@ -1850,14 +1852,6 @@ right before pushing: make check-channel-news @end example -For anything else, please post to @email{guix-patches@@gnu.org} and -leave time for a review, without committing anything (@pxref{Submitting -Patches}). If you didn’t receive any reply after two weeks, and if -you're confident, it's OK to commit. - -That last part is subject to being adjusted, allowing individuals to commit -directly on non-controversial changes on parts they’re familiar with. - @subsection Addressing Issues Peer review (@pxref{Submitting Patches}) and tools such as -- 2.38.1