Re: Git Debug Branch

From: René Ferdinand Rivera Morell (grafikrobot_at_[hidden])
Date: 2025-04-11 03:17:21

On Thu, Apr 10, 2025 at 9:11 PM Robert Ramey via Boost <
boost_at_[hidden]> wrote:

> On 4/10/25 2:01 PM, René Ferdinand Rivera Morell via Boost wrote:
> > On Thu, Apr 10, 2025 at 3:43 PM Robert Ramey via Boost <
> > boost_at_[hidden]> wrote:
> >
> >>   I've found in both the
> >> libraries I maintain, some "maintainers" check into the master branch
> >> directly from a feature branch used for debugging.
> >
> >
> > Can you point to specific such cases?
>
> Here's one from the Safe Numerics library:
>
>
> https://github.com/boostorg/safe_numerics/commit/777e0be5ec763d0333a717c5e421a4f7c5e5bdc9

Just looking at that one, as I suspect the others are the same, it looks
perfectly normal. Peter made a build system fix in the develop branch,
probably waited for tests to pass, and then cherry picked the change from
develop to master. Which is the appropriate way to do things that will
track history such that the master branch can get specific fixes sooner
than general merging from develop to master. And is the way that will
ensure that the change is not clobbered (or munged) when such a general
develop to master merge is done. Of course assuming that one doesn't
otherwise make changes to master that bypass the develop branch.

-- 
-- René Ferdinand Rivera Morell
-- Don't Assume Anything  -- No Supongas Nada
-- Robot Dreams - http://robot-dreams.net