Mailing-List: contact dev-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
MIME-Version: 1.0
In-Reply-To: 
 <CA+RK=_AxDS+fhWcYfCQMduPXp7VKNRv+UbsDj+gxRZiSj9OewQ@mail.gmail.com>
References: 
 <CALte62z0toz0wnTyM_uJgDA-sAK61kLqBZdraUPV6LGXY0f7vA@mail.gmail.com>
 <1805287335.214156.1432272385170.JavaMail.yahoo@mail.yahoo.com>
 <A531CFBE-E1E2-4AB9-BD96-8AC3B75C0154@gmail.com>
 <CALte62yK20kc5FUTPGO6Sak9ob4H7dADYrdJ8Ct8Hq8uCkU6ow@mail.gmail.com>
 <CA+RK=_Aq=3UDMOGRHsEXu0X5P6yQ6NR87q57fjvC_PpA-6k3WQ@mail.gmail.com>
 <CANZa=GuS+Ce__JnZuxL9Mrcb8RFPf09wB_P5ViBPgYtwTVrZ2A@mail.gmail.com>
 <CA+RK=_B1GomCSnJL7bsQ29g7RxH2kUHSfa4iWaxLVUOM6POL8g@mail.gmail.com>
 <CA+RK=_AxDS+fhWcYfCQMduPXp7VKNRv+UbsDj+gxRZiSj9OewQ@mail.gmail.com>
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Fri, 22 May 2015 11:33:22 -0700
Message-ID: 
 <CANZa=GvE30eTee3xO6fGqfa717bF4z0uk6vAHiGy05fvCkVhzQ@mail.gmail.com>
Subject: Re: Git branch-1.1.0?
To: hbase-dev <dev@hbase.apache.org>
Content-Type: multipart/alternative; boundary=001a11c2382c50c0f50516afe68c

--001a11c2382c50c0f50516afe68c
Content-Type: text/plain; charset=UTF-8

On Fri, May 22, 2015 at 11:28 AM, Andrew Purtell <apurtell@apache.org>
wrote:

> FWIW, I make local branches for RCs but only push up tags I make from
> commits on the local branch, not a ref for the branch.
>

Oh, interesting. Would that have been the more correct action for me to
have taken with the RC approach I used? If I delete branch-1.1.0, the tags
would remain? I don't think deleting the branch is helpful. Sorry about the
confusion though, I should have sent a note to dev explaining myself when I
took the action.

-n

On Fri, May 22, 2015 at 11:26 AM, Andrew Purtell <apurtell@apache.org>
> wrote:
>
> > Pardon, that was an unfortunate typo. I meant branch-1.1.0.
> >
> >
> > On Fri, May 22, 2015 at 11:06 AM, Nick Dimiduk <ndimiduk@apache.org>
> > wrote:
> >
> >> Don't delete branch-1.1. Let me explain.
> >>
> >> branch-1.1.0 was my use in creating rc1+. I created it from the 1.1.0rc0
> >> tag and spun subsequent RC's as commits on that branch. The idea was to
> >> de-risk further RC's by not bringing in changes that were unrelated to
> >> reviewers' criticisms raised on the VOTE thread. Any fixes were first
> >> committed to branch-1.1 and then applied to branch-1.1.0 (rc1 was sunk
> >> because I had brought back a patch from master instead of branch-1.1).
> Now
> >> that 1.1.0 is released, branch-1.1.0 is effectively dead -- except for
> hot
> >> fix releases; I didn't check but I would expected 1.1.0.1 to have been
> cut
> >> from branch-1.1.0. Further branch-1.1.x patch release will be cut from
> >> branch-1.1 as "normal". I may or may not create similar branches for
> >> further release candidates on the 1.1 line, depending on how RC
> candidate
> >> stabilization goes.
> >>
> >> When we're ready for 1.2, it will be branched from branch-1, creating
> >> branch-1.2.
> >>
> >> On Fri, May 22, 2015 at 9:30 AM, Andrew Purtell <
> andrew.purtell@gmail.com
> >> >
> >> wrote:
> >>
> >> > So what should we do with branch-1.1? Delete it?
> >> >
> >> >
> >> > On Fri, May 22, 2015 at 5:09 AM, Ted Yu <yuzhihong@gmail.com> wrote:
> >> >
> >> > > Thanks for the correction, Andrew.
> >> > >
> >> > > On Thu, May 21, 2015 at 10:43 PM, Andrew Purtell <
> >> > andrew.purtell@gmail.com
> >> > > > wrote:
> >> > >
> >> > >> I think there is some confusion here because I'd expect to make a
> 1.2
> >> > >> release branch from branch-1, eventually. Branch-1 is even
> helpfully
> >> > >> versioned 1.2.0-SNAPSHOT. We have enough branches already (smile).
> >> > >>
> >> > >>
> >> > >> > On May 21, 2015, at 10:26 PM, lars hofhansl <larsh@apache.org>
> >> wrote:
> >> > >> >
> >> > >> > Huh? We should create a 1.2 branch of branch-1. We do not need to
> >> have
> >> > >> a branch for every patch release.There's clearly something I am
> >> missing.
> >> > >> > -- Lars
> >> > >> >      From: Ted Yu <yuzhihong@gmail.com>
> >> > >> > To: "dev@hbase.apache.org" <dev@hbase.apache.org>; lars
> hofhansl <
> >> > >> larsh@apache.org>
> >> > >> > Sent: Thursday, May 21, 2015 10:13 PM
> >> > >> > Subject: Re: Git branch-1.1.0?
> >> > >> >
> >> > >> > branch-1.1 corresponds to the (upcoming) 1.2.0 release.
> >> > >> >
> >> > >> > branch-1.1.0 was for the just released 1.1.0
> >> > >> >
> >> > >> > Cheers
> >> > >> >
> >> > >> >
> >> > >> >
> >> > >> >> On Thu, May 21, 2015 at 10:00 PM, lars hofhansl <
> larsh@apache.org
> >> >
> >> > >> wrote:
> >> > >> >>
> >> > >> >> Just saw we have a branch-1.1.0 branch in git. What do we use
> that
> >> > one
> >> > >> >> for? 1.1.x releases should be tags on branch-1.1, no?
> >> > >> >> Thanks.
> >> > >> >> -- Lars
> >> > >> >
> >> > >> >
> >> > >>
> >> > >
> >> > >
> >> >
> >>
> >
> >
> >
> > --
> > Best regards,
> >
> >    - Andy
> >
> > Problems worthy of attack prove their worth by hitting back. - Piet Hein
> > (via Tom White)
> >
>
>
>
> --
> Best regards,
>
>    - Andy
>
> Problems worthy of attack prove their worth by hitting back. - Piet Hein
> (via Tom White)
>

--001a11c2382c50c0f50516afe68c--