Subject: Re: [boost] Branch names?
From: Mateusz Loskot (mateusz_at_[hidden])
Date: 2013-12-10 13:50:57
In gitflow, hotfix/ is dedicated to branch followed immediately by hotfix
But, not every bugfix leads to release, so no dedicated prefix for such
utility branches serving bug fixes only.
Hence, hotfix and bugfix are not equivalent names - just pointing this out.
Mateusz Loskot, http://mateusz. loskot.net
(Sent from mobile, apology for top-posting or broken quotes)
On 10 Dec 2013 17:04, "Beman Dawes" <bdawes_at_[hidden]> wrote:
> I've been working on Modular Boost Library Workflow Overview.
> See https://svn.boost.org/trac/boost/wiki/StartModWorkflow
> In addition to the requirement for "master" and "develop", there is strong
> encouragement for naming conventions if several other branches are present:
> * feature/descriptive-name for feature branches. For example,
> * bugfix/descriptive-name for bug-fix branches, including hotfixes. For
> example, bugfix/ticket-1234-crash-if-result-negative
> * release.n.n.n for release staging branches. For example, release.1.56.2.
> Should "bugfix/..." be changed to "hotfix/...", since that's the name given
> in the Git Flow blog posting? While I see lots of advantages to following
> Git Flow naming, I've never been sure what "hotfix" means. It seems weird
> to call a low-priority cosmetic fix a "hotfix".
> What is the usual practice for description names? Can they include spaces?
> Is there any reason to recommend spaces vs underbars vs hypthens?
> Are there any other branches we should recommend names for?
> Unsubscribe & other changes: