From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id MMsaHCLiXmeGWQEAqHPOHw:P1 (envelope-from ) for ; Sun, 15 Dec 2024 14:05:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id MMsaHCLiXmeGWQEAqHPOHw (envelope-from ) for ; Sun, 15 Dec 2024 15:05:22 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=itD5G23V; 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=1734271522; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=d5u/vYceTU+Ptyv2Ql8ol9W5/286hpdi8cBtDYH+nm0=; b=Ah8yGzURB+YJjU/qEGKdLn8eVbHXebsdSv7Ad56hOQQZkrYGt3VjU4WQsfTqjHgq0+3LTB rSyjtitPRlSmqkHqIeAwFtFtYQXa46R5cS+ofE/Lqhwxrd1Mo190M0xrSVfNetEEV919qZ uw58xTNtEaP1OXS1ULyMnI7+yHHYFPNeq9uWvKNFmo1z+qt75koduAGM1Bu7TBc6VQO9XD Sm+1ccJc9T/qkRse+nETGMC2ZywNUyeOlq2iRVFKwysX5OY2y0CxByVOjEKAYYcYhkbp0K FxqG2TGhL9ZbK+i56ZhnB3GYKvuV4UQjlXgG68CHGAI8Yp80Uax0UHiZBLCHcw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734271522; a=rsa-sha256; cv=none; b=BOrGhU5VjgO9Gz+K496otuuc5nfAOPizXz43UxgURLMmgzQvrZAKAw1RBRiW5zmbuGhLQE CRTp+P7c33M3bF3er7M4rgd4MAjLQHGGyaJtWL7BJq4DnNg8WX62HXJt5hygiIxDRF7bdR JGU5Wx+GIcEQ9vENKmHXERP+oXRkQsZp5wuh1/s4/vF0N424dyUXu7Rx1dZU7rR+HfaczK aayP9+dRG5EIK8k7F+mgXR3uXJofPbG2y+rpYpkzpWic25yzAhkLV5JGf0lEGymmAYg1nk oWX6XolvZ7bXvaHmZ8YHudj4ioDH58azHd0iTg4810sYLVizb1YGjq/jRy8iyA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=itD5G23V; 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 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 29CB180EDD for ; Sun, 15 Dec 2024 15:05:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMpEm-0006Ba-1S; Sun, 15 Dec 2024 09:04:48 -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 1tMpEk-0006BB-4p for guix-devel@gnu.org; Sun, 15 Dec 2024 09:04:46 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tMpEi-00033l-7i; Sun, 15 Dec 2024 09:04:45 -0500 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-725c86bbae7so2617388b3a.3; Sun, 15 Dec 2024 06:04:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734271480; x=1734876280; darn=gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=d5u/vYceTU+Ptyv2Ql8ol9W5/286hpdi8cBtDYH+nm0=; b=itD5G23VE54USlGT+43qLXxm292MIcntR3aeNAurEG/BX7yHW0zEZFtylPHnb0vJ+L 3U13JqzG/XzDWF8xiJvw0HSBSdTzuSNwDkrTe5Gku3Q8cimU5i9ocxt8mg59HY9uRgXB wgCdHJdYtbaJ0c2dWjP5W7B0btlFyN55xhGQsfeEB4lL9JRQOfd/Cka4HTNS/UHTXF5t FgdBC/ht9ZIwsdzCzpG3UtMN7t4pWLUMXq1kgD8VxgKEgL/wWUa0v9QhruR94Q6m5vsO OLrRNvGeuOu0z0Ktgb4QT0c7ExDFs9LNSv40wBiC++067HXsgGgm8MY0HdTu25w6n9cl VrzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734271480; x=1734876280; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=d5u/vYceTU+Ptyv2Ql8ol9W5/286hpdi8cBtDYH+nm0=; b=MehPUg5JE0WGgtfnRYBK49+GkRQS65IPycJXWEQuRASj6M/WtnS22fh9T/mJ2tGGXr gInmts1gpO667mCMSsILUxOjI8XTOoTWypKKF4BDv4IWYqHOSQf9xynoQvg98y/k46LM osxvmZtQdKXYXm0nkvJT9ssNqYZjUwSpczLX4A9i7yzEVw2EsYdohaer6Vo7VocBnShS jPm7bJ2hABak4nL8yp8D37qqktketpwTmNgmiKesjCi4oVmLJABSngFFtyPwMBCPLZls qZqk7NwNZgWkwotp8qTuKQjG80gTL2FEGgN2GMH52yzEeqFvw0A4jxPNPvv8YTAeuc3a AUTg== X-Forwarded-Encrypted: i=1; AJvYcCUJxq1Xb7ZJYcDUg6AdMDr+byst0oF+Tgkne9PJ8bCzqjBUX7fJTR486SucIhs2YQdVE55J7g==@gnu.org, AJvYcCXB9VZjaic3dsdywgsAUjWfp+oVSKIWF8nu/tYOzY4bH+OYra36oD1uXdwFtp2ftpw3ZsRlvvj72Aks@gnu.org X-Gm-Message-State: AOJu0YxFI/uFOP0tu6hJdx36xmlVa7x2lFoEln5IBIg2n7ijg889QFJC WqBq7SHx9yGf9MfxMhyXCMvpkk2JzzlG0Cgpk3WQ2xZw/ReUNqBG7ckLqUc8 X-Gm-Gg: ASbGncvaOICZh0jgErFdWjRMRhBS1qCifMVJHFEcomtAu/zEO4sBNwgTZOXDShHdbi6 kuJDuYzRhcqcRIXGBuFw4W0Qu5zyKjm//2Jh9JIuQs81TCGlVelvKsMXFEsyYhJ9fSHz55NSUpQ xpsGesHx61XFVXei9FgkcVjIkWt5I5Z18FsySFmBDn0cbevZl1r2APuL3ogDYtXduSiMbcq4BvL y0wxFpLg/OqtHC4sNt+X9X/566jBFCvCNQTPxtIH1oXP4Gr6Pxy0Q== X-Google-Smtp-Source: AGHT+IH0NdVfBO9aQAeqQ+q52m0QXZ+IGuTrvf0XemVee4pIqFWreuwYwncNB6Cf8YLfk/wTCNELUg== X-Received: by 2002:a05:6a20:3d83:b0:1e1:c054:4c58 with SMTP id adf61e73a8af0-1e1dfc19815mr13007161637.2.1734271479782; Sun, 15 Dec 2024 06:04:39 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918bad621sm2963795b3a.156.2024.12.15.06.04.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 06:04:39 -0800 (PST) From: Maxim Cournoyer To: Christopher Baines Cc: Janneke Nieuwenhuizen , Steve George , Ludovic =?utf-8?Q?Court=C3=A8s?= , guix-devel Subject: work-in-progress team branches (was: Re: =?utf-8?Q?=E2=80=98core-?= =?utf-8?Q?updates=E2=80=99?= is gone; long live =?utf-8?Q?=E2=80=98core-packages-team=E2=80=99!=29?= In-Reply-To: <87h675mdqm.fsf@cbaines.net> (Christopher Baines's message of "Sun, 15 Dec 2024 10:39:45 +0000") References: <87le0cj13e.fsf@inria.fr> <87v7zfuwv5.fsf@cbaines.net> <87bjxdzjdh.fsf@gmail.com> <87ttb5e587.fsf@gnu.org> <87h675mdqm.fsf@cbaines.net> Date: Sun, 15 Dec 2024 23:04:28 +0900 Message-ID: <87msgxvy8j.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=maxim.cournoyer@gmail.com; helo=mail-pf1-x433.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -9.43 X-Spam-Score: -9.43 X-Migadu-Queue-Id: 29CB180EDD X-Migadu-Scanner: mx11.migadu.com X-TUID: C+5LHsPd6paZ Hi, Christopher Baines writes: [...] >>> Hm. So is the intention that the moment a branch is created, it is >>> expected to be in a good shape to be merged? >> >> [..] >> >>> For multi-people team endeavours (e.g., GNOME, although Liliana has been >>> doing most of the work (thanks!)), it seems a bit unreasonable to expect >>> the branch to be ready from the moment it lives. >> >> That's the case with the current `core-packages-team'; sorry I if >> derailed this fresh new policy/idea just after it was conceived... >> >> The `core-packages-team' branch focusses on the gcc-14 transition, so >> that we may offload to 64bit childhurds: the 64bit Hurd needs gcc-14 and >> updating gcc for one architecture/platform only was rejected as overly >> complicated. This means, however, that while I'm looking mainly at >> x86_64 and reconfigure'ing my system on `core-packages-team', Efraim has >> been looking at the impact on other architectures. I don't see how we >> would co-ordinate our efforts without a common work-in-progress branch? >> >> We've been seeing a regular stream of `squash' commits fixing our and >> eachother's patches and I'm keeping `core-packages-team' rebased >> regularly and hope that we don't need to merge it once it's ready, but >> can just push the final rebase. > > I think what you're doing is fine. the only thing I'd suggest to change > is regarding branch naming. This isn't documented, but > data.qa.guix.gnu.org (and QA) ignore branches where the name begins with > wip-. > > So if as you say this branch is currently being worked on, but not quite > ready to be merged, then I'd suggest naming it as wip-core-packages-team > (or anything else beginning with wip-). That way, the data service will > ignore it and can spend it's time looking at other branches/patch > series. I see; that sounds workable, although it was nice to get substitutes for the 'gnome-team' branch even though it was a WIP (in the sense that we weren't sure the new reviewed commits would build/integrate fine before pushing them to the gnome-team branch). We'll need to register another branch (the wip-* one) to Cuirass for this use case I guess. Does the following doc addition makes sense? I've placed it at the end of the 'Managing Patches and Branches' section: --8<---------------cut here---------------start------------->8--- 1 file changed, 11 insertions(+) doc/contributing.texi | 11 +++++++++++ modified doc/contributing.texi @@ -2362,6 +2362,17 @@ Managing Patches and Branches Once the branch has been merged, the issue should be closed and the branch deleted. +@cindex work-in-progress branches, wip +@cindex wip branches +Sometimes, branches may be a work in progress, for example, for larger +efforts such as updating the GNOME desktop. For such cases, the branch +name should reflect this by having the ``wip-'' prefix. The QA +infrastructure will avoid building work-in-progress branches, so that +the available resources can be better focused on building the branches +that are ready to me merged. When the branch is not longer a work in +progress, it should be renamed, with the ``wip-`` prefix removed, and +only then should the merge requests be created, as documented earlier. + @node Debbugs User Interfaces @subsection Debbugs User Interfaces --8<---------------cut here---------------end--------------->8--- -- Thanks, Maxim