The 0.8.1 tag came back because some committers had the tag locally
and did a push before updating their local checkouts. The tag + branch
combination is confusing. E.g., if you have a local 0.8.1 branch, git
log 0.8.1 will show changes on the tag, not the local branch.

Committers will need to delete their local 0.8.1 tag or do a git pull.

Thanks,

Joel

On Thu, Mar 20, 2014 at 05:39:32PM -0700, Neha Narkhede wrote:
> The tag was the problem. I renamed the tag to 0.8.1.0 and kept the branch
> as 0.8.1. That allowed me to push to the 0.8.1 branch.
> 
> Thanks,
> Neha
> 
> 
> On Thu, Mar 20, 2014 at 4:02 PM, Joe Stein <joe.st...@stealth.ly> wrote:
> 
> > Right, wasn't thinking... Rushing to board.  So remove 0.8.1 tag and retag
> > the branch as 0.8.1.0 ( I should have done that in the first place )?
> >
> >
> > /*******************************************
> >  Joe Stein
> >  Founder, Principal Consultant
> >  Big Data Open Source Security LLC
> >  http://www.stealth.ly
> >  Twitter: @allthingshadoop
> > ********************************************/
> >
> >
> > > On Mar 20, 2014, at 3:57 PM, Neha Narkhede <neha.narkh...@gmail.com>
> > wrote:
> > >
> > > git checkout -b 0.8.1
> > >
> > > Didn't work. This just checks out trunk on a local branch called 0.8.1.
> > I'd
> > > like to checkout the branch origin/0.8.1 and push the patch to the
> > branch.
> > > For some reason, that doesn't work for me. Joel also tried and didn't
> > work
> > > for him. I wonder if I'm missing something obvious about it, so I guessed
> > > it must be the tag.
> > >
> > > Thanks,
> > > Neha
> > >
> > >
> > >
> > >
> > >> On Thu, Mar 20, 2014 at 3:43 PM, Joe Stein <joe.st...@stealth.ly>
> > wrote:
> > >>
> > >> 0.8.1 is a branch (also)
> > >>
> > >> after a clean git clone you should be able to-do
> > >>
> > >> git checkout -b 0.8.1
> > >>
> > >> git checkout 0.8.1 would put you on the tag
> > >>
> > >> agreed though we need a better name for tags moving forward or even now,
> > >> about to board a plane but how about if you change/retag the last
> > commit as
> > >> 0.8.1.0
> > >>
> > >> this way we have branches without the last digit and use that for the
> > fixes
> > >> for a release?
> > >>
> > >>
> > >>
> > >> /*******************************************
> > >> Joe Stein
> > >> Founder, Principal Consultant
> > >> Big Data Open Source Security LLC
> > >> http://www.stealth.ly
> > >> Twitter: @allthingshadoop <http://www.twitter.com/allthingshadoop>
> > >> ********************************************/
> > >>
> > >>
> > >> On Thu, Mar 20, 2014 at 6:14 PM, Neha Narkhede <neha.narkh...@gmail.com
> > >>> wrote:
> > >>
> > >>> Joe,
> > >>>
> > >>> I'm unable to take
> > >>> patches<
> > >>
> > https://issues.apache.org/jira/browse/KAFKA/fixforversion/12326539/?selectedTab=com.atlassian.jira.jira-projects-plugin:version-summary-panel
> > >>>> on
> > >>> 0.8.1 and the reason is probably that 0.8.1 is tag, not a branch.
> > >>> Should
> > >>> we create a branch and rename the tag to something like 0.8.1-release?
> > >>>
> > >>> Thanks,
> > >>> Neha
> > >>>
> > >>>
> > >>> On Wed, Mar 19, 2014 at 9:34 AM, Neha Narkhede <
> > neha.narkh...@gmail.com
> > >>>> wrote:
> > >>>
> > >>>> The problem with doing this point release from trunk is that it will
> > >> pick
> > >>>> up the offset management feature, which is pretty large and risky for
> > >> the
> > >>>> same reasons. I think it is worth taking blocker bug fixes only on
> > >> 0.8.1
> > >>>> branch and in two weeks or so release 0.8.1.1.
> > >>>>
> > >>>> Thanks,
> > >>>> Neha
> > >>>>
> > >>>>
> > >>>> On Wed, Mar 19, 2014 at 7:50 AM, Joe Stein <joe.st...@stealth.ly>
> > >> wrote:
> > >>>>
> > >>>>> I wanted to start a discussion thread around the next release.
> > >>>>>
> > >>>>> 1) Are we going to-do a release that has the fixes for the critical
> > >>> issues
> > >>>>> that came up with 0.8.1?
> > >>>>>
> > >>>>> 2) If we do a release with those fixes are we doing them off of trunk
> > >> or
> > >>>>> back port them to 0.8.1 branch and tag that as 0.8.1.1 .... or branch
> > >>>>> 0.8.1
> > >>>>> into a 0.8.1.1 branch and back port the trunk patches to 0.8.1.1
> > >> branch
> > >>>>> and
> > >>>>> tag that.
> > >>>>>
> > >>>>> If we decide to release off of trunk then we should (imho) have the
> > >>>>> release
> > >>>>> be 0.8.2 but if we do it off the 0.8.1 branch then it should become
> > >>>>> 0.8.1.1.
> > >>>>>
> > >>>>> 3) When do we want to-do this?
> > >>>>>
> > >>>>> /*******************************************
> > >>>>> Joe Stein
> > >>>>> Founder, Principal Consultant
> > >>>>> Big Data Open Source Security LLC
> > >>>>> http://www.stealth.ly
> > >>>>> Twitter: @allthingshadoop <http://www.twitter.com/allthingshadoop>
> > >>>>> ********************************************/
> > >>
> >

Reply via email to