From owner-freebsd-git@freebsd.org Thu Dec 3 14:49:58 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6A0274A80D7 for ; Thu, 3 Dec 2020 14:49:58 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CmzJk1MFwz3rKB for ; Thu, 3 Dec 2020 14:49:58 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 2BFCD4A80D6; Thu, 3 Dec 2020 14:49:58 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2BC344A805A for ; Thu, 3 Dec 2020 14:49:58 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CmzJj3LfYz3rGL; Thu, 3 Dec 2020 14:49:57 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: by mail-qv1-xf2a.google.com with SMTP id cv2so1023698qvb.9; Thu, 03 Dec 2020 06:49:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=QSNBOWWdGHmB9Y8BKDYw1S/JY4agn1jaMQ3tq8foo7M=; b=QZ+RibCuMUYTEwzGoFWzJygevNW30ZBplP7AZCRuT8fFNMaVTREuabYIkwRQzkwjeo RBr722PkJpzdwIaQLli/h84jvqHV+FZ2qg1DaILLUKIh+KM32W6gyv1J0YIaoe7oeA9q w3a7bF4HbGeVHeU5govDCdmdouMhbDckXdqSYUxn2OO3nQzw00urMOzS+rh6/+2qTP6B F8oXTW8L5uuN8qMirUsz5ax2PO5h06ZFj2MunipHEbwpdvr8SFZejQplkz7G/tonetmh Urtl15M8g9fBklVsQoLktTD1QSwwaOwqlrEnCPzwd9C4BHO03wlnTJ/8oX2aot2NQ3mD uHQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=QSNBOWWdGHmB9Y8BKDYw1S/JY4agn1jaMQ3tq8foo7M=; b=eOPq4PdQtJ7SvDa2iN5E11N50/MVkc1pV/1EbHSCPB5iQqLgtAIUCzBhZBNZQAIZlh 4zT6DvWud6MTjJOOyveH+uSOaZ8ioaUJJDrdBv/d5etIoub3v6TTGVJThxStnffC6OkH FHdVYz9EK2DCN3vOBvaFxAI34OktlJCpBnSaRZS9kPS/orhk3j/acn2BbRWPu+UPHEXn FDjlyDYSwtZ+bN/9Bc8Ld77vdvBlKGIawyV2ttKpDJMK5Il8b5ID8DuCPqlQN5KX8cY/ zNWrPEvA8bnFD6KNVyT4PEPPlXPN6xgjATe1/db0yOWLD4ESFqkRwi+Qui12CkW3GCA5 xpfA== X-Gm-Message-State: AOAM532sodrL/JSbtHx0l6eqo1VP5plGR4Tw1DagaE7E69Zil+UDblY7 lBpkpzXQKBqEdmpSpGosRyY= X-Google-Smtp-Source: ABdhPJydrsObgM1Jku4Th5OtvKlIXehGhzve1A81IAer5ak7Z73x8fs9+tSgA3Oht0qLgFha5/xM9g== X-Received: by 2002:a0c:ba20:: with SMTP id w32mr3479872qvf.50.1607006996580; Thu, 03 Dec 2020 06:49:56 -0800 (PST) Received: from [192.168.222.18] (192-222-183-158.qc.cable.ebox.net. [192.222.183.158]) by smtp.gmail.com with ESMTPSA id l28sm1537898qkl.7.2020.12.03.06.49.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Dec 2020 06:49:55 -0800 (PST) Subject: Re: Using git branches for ports (was: Re: converting rmport to git) From: Marc Branchaud To: Warner Losh , =?UTF-8?Q?Ulrich_Sp=c3=b6rlein?= Cc: git@freebsd.org, "portmgr@FreeBSD.org" References: <20201129164707.GA31739@freefall.freebsd.org> <14871125-A032-4980-8DB1-0210E34D5A11@FreeBSD.org> <20201130105337.GA42359@freefall.freebsd.org> <7246FB00-655B-4BD4-BC99-B87E4595969C@FreeBSD.org> <20201201095906.GA50345@freefall.freebsd.org> Message-ID: <4dccb673-7860-b2b4-501d-5c28b60d53c3@gmail.com> Date: Thu, 3 Dec 2020 09:49:54 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4CmzJj3LfYz3rGL X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=QZ+RibCu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of marcnarc@gmail.com designates 2607:f8b0:4864:20::f2a as permitted sender) smtp.mailfrom=marcnarc@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f2a:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f2a:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2a:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2020 14:49:58 -0000 Thanks to Warner and Ulrich for setting me straight. The points you both raised clearly show how my proposal is impractical, so I'm dropping the idea. I believe I understand why the quarterly Ports branches have to be constructed by cherry-picking commits from the main branch. What I find unfortunate is that this practice makes it impossible to use Git's standard tools to answer questions like "Which branches contain this piece of work?" (which seems to be an important question, given what I've read on freebsd-git over the last little while). While it's certainly possible to use Git's notes and/or special commit message lines to build a system on top of Git that provides the desired level of traceability, I'd like to think that would be done as a last resort. It's pretty obvious that y'all have been thinking about how FreeBSD should use Git for quite a while. Is there any record of discussions or evaluations of various Git approaches for FreeBSD that I could read? I'm keen to understand how the project has arrived at its current practices. Thanks for taking the time to indulge my curiosity! M.