From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 2I9sKy53MmYJHQEA62LTzQ:P1 (envelope-from ) for ; Wed, 01 May 2024 19:09:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 2I9sKy53MmYJHQEA62LTzQ (envelope-from ) for ; Wed, 01 May 2024 19:09:02 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714583342; 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:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=bFAvmh3ifITSHoqIw9ZSZf5mkrfG/6xogGxtj9qY1wk=; b=gc8Mwk24YxQ4VNwORYNvSAcng4yGbPRfZr9rS0vx+jSpaI2q1QmAgOGnYr+lFHN/0AJDxy c6dd0X9z7rCyNjOo6Xrn6vj4hzhLrrTH3uYNdg/vB973mmUTEHBw/R0PIcWJ3BPf8xUdSN dQgXHP7AXXpSpz7xGupFjeasTBt36Oq1bNUR52pGSlrRkY/x7uGqBIVyTvkIYdFLLlEsTq Uf/XVm4TtwBmVcU3GsqZQsZgZpKdc9NIDtJPFL3YD3xyJ9sYn4vlgIfCEQ+8WHz4qzJZqw Dpj/CROIdNHWgXX4xV/BN0EvAGcK2CYexBPZcmQE98EZ+ODRDWqHHpQ6oPz/Rg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714583342; a=rsa-sha256; cv=none; b=RKBOrcsxS6om2avtughSOTukmh1Cnpkqq/bWbj0s2gdpAwx7MdPRko3cvZWwLFuRqC0J61 WUG2XQ00hpr5qI4TqrcjyOQrEwY0iTohnPhDjc65ybfeahNjixw2eGBociFo8RfBzapav1 NSyEs9z+8XvRGZ4F+pOr0LJ4e6g643lmJKe/vDhbOIZ+SiNg2pCntwb02PWqEdkzhe0P3O V35Rveb4yJX/ts9zo+csQJxF2vaVHBqUEVigutqHD2ro7lxlozTNBvAZBQ26hJqv1tcCtz WAO9HJ5w0JAFZINixyTPdGGjhFvMaEBVnW71OhxHeB/Ncx8iwijBZXlmVIRKCA== 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 6B2387030B for ; Wed, 1 May 2024 19:09:02 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2DRi-0003Fz-TG; Wed, 01 May 2024 13:08:42 -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 1s2DRh-0003FS-0p for guix-patches@gnu.org; Wed, 01 May 2024 13:08:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2DRg-0006ET-NY for guix-patches@gnu.org; Wed, 01 May 2024 13:08:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s2DS1-0004H2-QE for guix-patches@gnu.org; Wed, 01 May 2024 13:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70549] [PATCH] doc: Make changes to the handling of branches. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 May 2024 17:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70549 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 70549@debbugs.gnu.org Received: via spool by 70549-submit@debbugs.gnu.org id=B70549.171458329516413 (code B ref 70549); Wed, 01 May 2024 17:09:01 +0000 Received: (at 70549) by debbugs.gnu.org; 1 May 2024 17:08:15 +0000 Received: from localhost ([127.0.0.1]:38437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2DRH-0004Gd-09 for submit@debbugs.gnu.org; Wed, 01 May 2024 13:08:15 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:58751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2DRF-0004GX-Tu for 70549@debbugs.gnu.org; Wed, 01 May 2024 13:08:14 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id CE70227BBE2; Wed, 1 May 2024 18:07:49 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c20c704d; Wed, 1 May 2024 17:07:49 +0000 (UTC) From: Christopher Baines In-Reply-To: <874jbh5wra.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 01 May 2024 18:20:57 +0200") References: <94192a7b7eb8d2dc5008c20abcc3940b4474d800.1713964129.git.mail@cbaines.net> <874jbh5wra.fsf@gnu.org> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Wed, 01 May 2024 18:07:46 +0100 Message-ID: <87jzkdv4t9.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -8.49 X-Migadu-Queue-Id: 6B2387030B X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -8.49 X-TUID: rafxjlPX4yo1 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: >> To help coordinate the merging of branches, you must create a new >> -guix-patches issue each time you wish to merge a branch (@pxref{The >> -Issue Tracker}). The title of the issue requesting to merge a branch >> -should have the following format: >> +guix-patches issue each time you create a branch (@pxref{The Issue >> +Tracker}). The title of the issue requesting to merge a branch should >> +have the following format: > > This means someone on the team with commit access explicitly commits the > branch at the time they send the merge request email, right? There's intentionally no mention of teams here, but that's pretty much it. I'm not intending this to be super strict, like forgetting the issue then creating it a day or two later is fine. You mention commit access, and that does make me think that maybe we should include something saying that if you don't have commit access, please go ahead and create the issue, and in it ask for the branch to be created. With the expectation that they'll be someone with commit access to help with creating and managing the branch. >> +@item >> +The commits on the branch should be a combination of the patches >> +relevant to the branch. > > Perhaps add: =E2=80=9C; patches not related to the topic of the branch sh= ould go > elsewhere.=E2=80=9D Good idea. >> +@item >> +Avoid merging master in to the branch. Prefer rebasing or re-creating >> +the branch on top of an updated master revision. >> + >> +@item >> +Minimise the changes on master that are missing on the branch prior to >> +merging the branch in to master. Merging master in to the branch can be >> +appropriate for this purpose. > > s/in to/into/ Good spot. Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYyduNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdCtQ/9F2NLJJai6GbdHNb4fqlZvFnKi6bsGTEy NI9BpFXEUe1Plp7rds3ZLCsW+itLvoFNJpengmrySsj/tPum/gWlEPwLyY/omtz3 05NZW0Xt16Ij0pHnKA/o5Xt8oZgBAEzsg33pgS8/uBFZcmFWebMFGvd/znTev2Xo MJPlnrb0pgS+9noqB8DRcYaEe3uea5PLiS+JyEqOkzBNfp78JwJV5pbyYt6HEFOJ 1dKfiPUTLywIqjN6xhEDfuPNYUr91CJRXYHVBAK3fvuRCjlYfNo0l/PXk4cz5p0X QshhDIgEwZ6vJImQgouzmkBqUKxmlOngiF3BLSfKG8m6JoB27oUMGAvzLVa21tNZ 2vtBI2zCdzJHn/XB9wKXhOfS082zrp4nmeHYCkMqu/yXWNDSLk3+BcSxJC6XvfW9 UGJPEQk5HE0OJLJko9uh+LNB60Y/G77iXDcfeNHw30gYJa+ssyWtmNOUf/FXjtzS S7U4Am1dCRlpp8/5SzIcwIOduNdQQnUF2phdmX7q44ya7WtMwkGpbzJt1yqyZOD0 6mNemQuJNQD/EXRKTqECoYIhTIhynQqyuLfUOD9ROWeHw0TPDNr2aYLXy/ovoPa/ GxlpE7ZC34WSE5j48SjtBIdE2nQNqR7ZwKjYu1gPExzXBMoky+WQX7Z8WNTn2kFB 6/ixkKhkUUM= =nkZH -----END PGP SIGNATURE----- --=-=-=--