Date: Thu, 3 Dec 2020 09:49:54 -0500 From: Marc Branchaud <marcnarc@gmail.com> To: Warner Losh <imp@bsdimp.com>, =?UTF-8?Q?Ulrich_Sp=c3=b6rlein?= <uqs@freebsd.org> Cc: git@freebsd.org, "portmgr@FreeBSD.org" <portmgr@freebsd.org> Subject: Re: Using git branches for ports (was: Re: converting rmport to git) Message-ID: <4dccb673-7860-b2b4-501d-5c28b60d53c3@gmail.com> In-Reply-To: <af365a33-1d53-ba0d-29fd-571dc72c7594@gmail.com> References: <20201129164707.GA31739@freefall.freebsd.org> <CAP7rwchHsz3x4v%2BWmxEqTyXOvJx6fUbRuKnirBPEPVzz7gMw0A@mail.gmail.com> <14871125-A032-4980-8DB1-0210E34D5A11@FreeBSD.org> <20201130105337.GA42359@freefall.freebsd.org> <7246FB00-655B-4BD4-BC99-B87E4595969C@FreeBSD.org> <20201201095906.GA50345@freefall.freebsd.org> <CANCZdfrMP--yZBedSoCBhAFuDzhxLt3BbNi=DCoErrXTtY=qtg@mail.gmail.com> <af365a33-1d53-ba0d-29fd-571dc72c7594@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4dccb673-7860-b2b4-501d-5c28b60d53c3>