From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 eHVnLU9DjWSmJwAASxT56A (envelope-from ) for ; Sat, 17 Jun 2023 07:23:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YNeHLE9DjWSqfwAAG6o9tA (envelope-from ) for ; Sat, 17 Jun 2023 07:23:27 +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 472E028A2D for ; Sat, 17 Jun 2023 07:23:27 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=protonmail.com header.s=protonmail3 header.b=pwWomASX; dmarc=pass (policy=quarantine) header.from=protonmail.com; 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=1686979407; a=rsa-sha256; cv=none; b=U5eQymnaWJL8sPY8Q97gMunESJnhv49iuxA7J+kqyVB6TzMzIuO+1Wsvty1w6wMHxEnrYN 9q5JvUGLM1+7/Cg5yhLGcbdzN3Sc7K7pKEl1hNoyJiQKTBerddSghCzxd1mAuscyZHZ78a 2Y+/KAqByrkDw7rNn22QaZo3S+1ZzFVtlcuzXR7at3SkZSQaGhu+nrDCdAqup5YTIOlSjk O0e7lmQNEsDmQKmTxbm+ktYLElCTEfEfFVb18/K3xGxDlUTIBDJQHW0ZVBNU2Rn380H4TV FOpbfxZdD8RyapHs/8xDS+PZiDqNtCfvwHJLNOx6HBKj53R+a1A+Sh/8FKjhtA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=protonmail.com header.s=protonmail3 header.b=pwWomASX; dmarc=pass (policy=quarantine) header.from=protonmail.com; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686979407; 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=jINfk7KKwO/Ik9x1w+9OtXLPKIcKSS3edfljNnwheSw=; b=cMauAuZV1LvcVVKxZuJWaUnWlI6LFFj1n9YuW8UKSdfkHkaCF2Uto7xyKWjghDKPkPIA6J /WHiZJ8Azn0gxmZttb1JryebujPH1KjudhzQfog14vTXc+tK3ppt4mdMkUxwMXx1+691c3 NJ9NGfZoYdYazTSwCdORuigpux9QfNcpf47pomB/+Tkewx7xYeNXWkNl+MniMk0tVNlOaN D/VSXZVVQiINQ+GSV1FPJcLCvFgfdZzBkobrsAOwrKKudLeSMzJjBhCqKcy+hlloFJEIz2 q9swyOi0JRxNhLXVEcpucSV1ssiskOvtV7GszOhWU6aMzJwsR+EJEyXEGGoUpw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAOOd-0000Fi-Ka; Sat, 17 Jun 2023 01:22:49 -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 1qAOOa-0000Fa-4H for guix-devel@gnu.org; Sat, 17 Jun 2023 01:22:44 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAOOY-0004O8-Cc for guix-devel@gnu.org; Sat, 17 Jun 2023 01:22:43 -0400 Date: Sat, 17 Jun 2023 05:22:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1686979351; x=1687238551; bh=jINfk7KKwO/Ik9x1w+9OtXLPKIcKSS3edfljNnwheSw=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=pwWomASX1KIR3vNxz2PXk7Y8xeYYZQWbQvF8KG5+YVXajc+tbRGjnY2imYgO54gLV KThULYqhQUvgzReYhoMLCNHUJkvyPl+4lHun2bFuZ0o99MEgSQGxWsFFrPpvMiQGa8 EnrFnnm4yST5b9Giky9EyjRHgnV6zbBCMosIevZc5hIDEiyWTbvBrNH6tBIvVmu7bj HtvPcN1BrMdcMxfFX1AWRuux2PbiWOrmp7dSb0m8UN5y4D7VaBUYLGP8zyIr5g0Qk4 IkGJjR0RuyYF3njv5QyV1NQOFTkKEWI8HjD86vBiRUUoAbbK7HqgSqvjy9URcEjyNU TcnqmSQkgm+fQ== To: Christopher Baines From: John Kehayias Cc: guix-devel@gnu.org Subject: Re: Changes to the branching/commit policy Message-ID: <871qiaslx6.fsf@protonmail.com> In-Reply-To: <87o7lktodm.fsf@cbaines.net> References: <87y1kuyqew.fsf@cbaines.net> <87o7lktodm.fsf@cbaines.net> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.133; envelope-from=john.kehayias@protonmail.com; helo=mail-40133.protonmail.ch 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_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -4.91 X-Migadu-Queue-Id: 472E028A2D X-Spam-Score: -4.91 X-TUID: ZFrEGZz1ahqG Hi Chris, On Mon, Jun 12, 2023 at 09:23 PM, Christopher Baines wrote: > > Christopher Baines writes: > >> The changes in #63459 have strayed now in to touching the commit policy >> [1]. My intent was to simplify the guidance by grouping it better, but I >> think the significant change here is that the commit policy now >> references the entire branching strategy, rather than just talking about >> sending patches for review. >> >> 1: >> >> That new branching strategy makes some "should" requirements on sending >> patches for review and pushing to topic branches for larger changes. It >> also makes a "must" requirement on opening guix-patches issues to track >> and manage merging branches. >> >> I'd like to merge these changes next week since they've been up for a >> few weeks, so do comment if you have any thoughts or if you'd like more >> time to review them. > > I've now merged these changes as > 0ea096ae23fa81f05ce97e5e61c15647c0a475ec. > > You can now see the updated Commit Policy on the website [1] (you might > need to force a refresh), as well as the new section on managing patches > and branches [2]. > > 1: > 2: > Thanks for these changes! Question on branches (sorry if this was covered in a previous thread, but now that we have new language in the manual I figure this is a good place): do we have a convention on branch names and subject headers for emailing patches for the branch? e.g. does [PATCH 1/3] do anything on the QA end? Or does the section about branch building for once patches are pushed to a branch on Savannah? Does that mean pushing to a branch should follow the same 1-2 week review allowing QA builds? I guess patch series are always built together on QA but wondering if there is anything else to be aware of or needs mentioning to keep things tidy and clear. Thanks! John