[asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

[Tzafrir Cohen]

On Wed, Dec 20, 2017 at 07:50:03AM -0700, George Joseph wrote:
> On Wed, Dec 20, 2017 at 2:44 AM, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
> wrote:
> 
> > Off-topic:
> >
> > On Tue, Dec 19, 2017 at 01:50:03PM -0700, George Joseph wrote:
> >
> > > Thankfully we tag EVERYTHING! :)
> >
> > asterisk(13)$ git describe
> > 13.15.0-rc1-908-ge31e3b581b
> >
> > asterisk(14)$ git describe
> > fatal: No tags can describe 'fb18797ae09a685ec71101499fb1c1c606b16397'.
> > Try --always, or create some tags.
> >
> > asterisk(15)$ git describe
> > fatal: No tags can describe 'd312068ee93ff8ce97b464f3c2ff3304e15cb3fe'.
> > Try --always, or create some tags.
> >
> >
> > I wasted half an hour yesterday trying to find out why a build sis not
> > switch from master to 13, only to realize that the name of the git
> > branch in the version string is always "master".
> >
> > We tag everything. But only well after it was branched from the main
> >
> branch.
> >
> 
> I'm not following you.
> 
> We tag every release...
> 
> $ git checkout 13.18.4
> HEAD is now at f4644317b7... Update for 13.18.4
> $ git describe
> 13.18.4


> $ git checkout 13.18
> Switched to branch '13.18'
> Your branch is up-to-date with 'gerrit/13.18'.
> $ git describe
> 13.18.4


> $
> 
> We have to create the minor release branch (13.18) and do the work there so
> that patch releases (13.18.4) are based on the minor release branch, not
> the major branch.

Those branches are likewise short-lived branches (at least with respect
to the number of commits). Real work is done on master, 13, 15 and such.
But when I'm on such a branch, I can't ask git on which branch I am (not
to mention: at which stage in it).

For instance: maybe whenever you tag a new release branch (e.g. 13.18),
tag the split point as something like "13.18.base" or "base.13.18"?

But maybe it's just me and branches 13 and 15 are not widely used (for
master it is irrelevant anyway).

-- 
               Tzafrir Cohen
+972-50-7952406           mailto:tzafrir.cohen at xorcom.com
http://www.xorcom.com