From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id oO6aMC1sMmY2CQAA62LTzQ:P1 (envelope-from ) for ; Wed, 01 May 2024 18:22:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id oO6aMC1sMmY2CQAA62LTzQ (envelope-from ) for ; Wed, 01 May 2024 18:22:05 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=sebl+mtA; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714580525; a=rsa-sha256; cv=none; b=NOh8y7LaSVuF/0eg+XdqakJjQmZQuZDpSmo4oei/o9CB+YFXvvUj0N3WJA4R4uU+gIRsCI KRquAGPfHenm67ohjupXBkyRcid96bljYFbZPa8TPlXA4DHR3ku/h+HkhrwWU6aPTGu37u 2eweCf6aXm14BRhWRrPWqKrFmZewDhtLZoNwh9mwNjNUyjE9lDvl+xcaeDqDcRCPr3QgRF yysnbdRRf2lichluORLdu+Q2lCX46vxfmXfEDJSbB66QYmoqivCXq5zRp4/QE9D386ATJ+ jngS1dt3IUAw2pka/Ovh8uCVT97kBxf5i+h/XkQ05+ESkopGYbdb1PVFRn0wmQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=sebl+mtA; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714580525; 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: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:dkim-signature; bh=xiObmoUniC4E/ixABwDaHpNJxHaO+YwaMsn8kASCgZw=; b=YPE7JJuOCzShHFw+BzLAVfokyjaEH0E0+jKbHI2mIr7t9p2PgmYPKg/w74UGX9EkpG03vr q/dMDgg5j9TteirsEYIXNqkI4ZKPUI2d6fVUOKORxPQ9A843298vqLv+Nn6p2/q0+Cm2Rb SorITc450kTGB6yhufJeOCbK7YDTOObj6WssbfRXZVV8d1hNB8nvdD+6adj5CEMmeYykCm YEMTvTIUw7Y2oyjZiNhug4keTBQCo+YSbb/Hb9vo3AKLO1aMkYDtCOMB3o8ffd8HYACwFV wb3DMJcPvxJadF2y5fqaQWnWeh0+3hpLJ0zfLdquszgrxLzPYmrBGBK+MyJ/Hw== 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 8F74C262E3 for ; Wed, 1 May 2024 18:22:05 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2CiO-0006V9-Da; Wed, 01 May 2024 12:21:52 -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 1s2CiF-0006Md-4G for guix-patches@gnu.org; Wed, 01 May 2024 12:21:44 -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 1s2CiC-00070c-Uy for guix-patches@gnu.org; Wed, 01 May 2024 12:21:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s2CiX-0003ON-RA for guix-patches@gnu.org; Wed, 01 May 2024 12:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70549] [PATCH] doc: Make changes to the handling of branches. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 May 2024 16:22: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: Christopher Baines Cc: 70549@debbugs.gnu.org Received: via spool by 70549-submit@debbugs.gnu.org id=B70549.171458048913019 (code B ref 70549); Wed, 01 May 2024 16:22:01 +0000 Received: (at 70549) by debbugs.gnu.org; 1 May 2024 16:21:29 +0000 Received: from localhost ([127.0.0.1]:38214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2Ci1-0003Nv-6B for submit@debbugs.gnu.org; Wed, 01 May 2024 12:21:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2Chz-0003NX-9C for 70549@debbugs.gnu.org; Wed, 01 May 2024 12:21:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s2ChY-0006xr-GE; Wed, 01 May 2024 12:21:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=xiObmoUniC4E/ixABwDaHpNJxHaO+YwaMsn8kASCgZw=; b=sebl+mtA5k4YJQRB7LFg 60n8mbsYSsd0V8RFTCAdb+D0D7TQHGKWL3PKrZtAMPN4QqMcjfrcbJGFCVhqhdjzJxvpMDUARem2C PpHhTLlefr77pi17+5YXN9HsVYRIKlLNcV9mZnUi3vcF+9yXehR8ubWmz/og4uJdB3ahW26SL6CpO SBQteSxyA1Ij9SlSUVfZZFrCIzGb+4f5qo3BJ9WtrB1gDnE3XUHPdFC6orGAqmb4qiUBequOgH3Uv rXXa8W05ZXRELkuzDupC0OyYzqA8iH1Cf+R239gc8VKxjoIC0R/7YTJ9bLJiocBMq3p+MmDveIuLK A8Xlj+Yb2Ok/RQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <94192a7b7eb8d2dc5008c20abcc3940b4474d800.1713964129.git.mail@cbaines.net> (Christopher Baines's message of "Wed, 24 Apr 2024 14:08:49 +0100") References: <94192a7b7eb8d2dc5008c20abcc3940b4474d800.1713964129.git.mail@cbaines.net> Date: Wed, 01 May 2024 18:20:57 +0200 Message-ID: <874jbh5wra.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Migadu-Queue-Id: 8F74C262E3 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -7.09 X-Spam-Score: -7.09 X-TUID: 2ueroXsWUQgH Hi, Christopher Baines skribis: > Require that you create a "Request to merge" issue when you create a bran= ch, > rather than when you wish to merge it. This should help avoid this step = being > missed. Excellent, I fully support this change! A couple of questions/comments: > Also, add information on how to manage these branches: > > 1. Suggest creating the branch from patches, rather than having a statef= ul > branch, since this should help to reduce complexity and avoid merges. [...] > 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? > +@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 shou= ld go elsewhere.=E2=80=9D > +@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/ Thank you! Ludo=E2=80=99.