Re: 9.5 branching?

The postgresql repository has branched of the REL9_5_STABLE branch. For
the time being, the "9.5" branch in the messages repository is still master.

I was wondering, would it be easier if we also branched off
REL9_5_STABLE in messages right now?

We could just ignore the master branch for now and later on fork it off
REL9_5_STABLE (instead of the other way around, which is what we'd
usually do).

(We could also blow away the master branch altogether and recreate it
later, but I don't know what that would do to new checkouts in the
meantime, because we don't have access to set the default branch on the
git.postgresql.org hosting.)

Peter Eisentraut wrote:
> The postgresql repository has branched of the REL9_5_STABLE branch. For
> the time being, the "9.5" branch in the messages repository is still master.
>
> I was wondering, would it be easier if we also branched off
> REL9_5_STABLE in messages right now?
>
> We could just ignore the master branch for now and later on fork it off
> REL9_5_STABLE (instead of the other way around, which is what we'd
> usually do).

I don't really care either way because by now I'm used to the way we do
things, but I have the recollection that having "master" not follow
upstream's master is confusing. However, I'm not sure that it makes a
lot of sense to branch "master" from REL9_5_STABLE.

> (We could also blow away the master branch altogether and recreate it
> later, but I don't know what that would do to new checkouts in the
> meantime, because we don't have access to set the default branch on the
> git.postgresql.org hosting.)

I think it might be useful to offer a way to change the default branch
using the web interface. Let me ask the sysadmin dudes. What would be
the git command to change the default branch?

--
Álvaro Herrera http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services

Le 1 juil. 2015 5:07 AM, "Alvaro Herrera" <alvherre(at)2ndquadrant(dot)com> a
écrit :
>
> Peter Eisentraut wrote:
> > The postgresql repository has branched of the REL9_5_STABLE branch. For
> > the time being, the "9.5" branch in the messages repository is still
master.
> >
> > I was wondering, would it be easier if we also branched off
> > REL9_5_STABLE in messages right now?
> >
> > We could just ignore the master branch for now and later on fork it off
> > REL9_5_STABLE (instead of the other way around, which is what we'd
> > usually do).
>
> I don't really care either way because by now I'm used to the way we do
> things, but I have the recollection that having "master" not follow
> upstream's master is confusing. However, I'm not sure that it makes a
> lot of sense to branch "master" from REL9_5_STABLE.
>

Agreed.

> > (We could also blow away the master branch altogether and recreate it
> > later, but I don't know what that would do to new checkouts in the
> > meantime, because we don't have access to set the default branch on the
> > git.postgresql.org hosting.)
>
> I think it might be useful to offer a way to change the default branch
> using the web interface. Let me ask the sysadmin dudes. What would be
> the git command to change the default branch?
>

On 6/30/15 11:07 PM, Alvaro Herrera wrote:
> However, I'm not sure that it makes a
> lot of sense to branch "master" from REL9_5_STABLE.

Why not?

> I think it might be useful to offer a way to change the default branch
> using the web interface. Let me ask the sysadmin dudes. What would be
> the git command to change the default branch?

https://stackoverflow.com/questions/3301956/git-correct-way-to-change-active-branch-in-a-bare-repository

Peter Eisentraut wrote:
> On 6/30/15 11:07 PM, Alvaro Herrera wrote:
> > However, I'm not sure that it makes a
> > lot of sense to branch "master" from REL9_5_STABLE.
>
> Why not?

Because it's at odds with what normally you do in Git, but I guess it
doesn't really matter.

> > I think it might be useful to offer a way to change the default branch
> > using the web interface. Let me ask the sysadmin dudes. What would be
> > the git command to change the default branch?
>
> https://stackoverflow.com/questions/3301956/git-correct-way-to-change-active-branch-in-a-bare-repository

Okay, so currently would be this:
git symbolic-ref HEAD refs/heads/REL9_4_STABLE
right?

--
Álvaro Herrera http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services

Peter Eisentraut wrote:

> (We could also blow away the master branch altogether and recreate it
> later, but I don't know what that would do to new checkouts in the
> meantime, because we don't have access to set the default branch on the
> git.postgresql.org hosting.)

I have changed the default branch to refs/heads/REL9_4_STABLE. Not
great, because you don't get 9.5 anymore in a default checkout. Feel
free to create the REL9_5_STABLE branch and remove master, and I can
re-point default branch to that.

--
Álvaro Herrera http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services