hbase-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stack <st...@duboce.net>
Subject MOB Branch HBASE-11339 vs hbase-11339 is messing up our being able to git fetch (Re: Unable to fetch?)
Date Mon, 03 Nov 2014 23:22:51 GMT
Same message but new title in case the MOB HBASE-11339 folks are not seeing
this.
St.Ack

On Mon, Nov 3, 2014 at 3:17 PM, Stack <stack@duboce.net> wrote:

> How did you do that Andrew?
>
> I looked at the two branches and they seem the same if I compare on a
> case-sensitive system (git log --oneline|head -100 ...) or if I look over
> on github:
>
> https://github.com/apache/hbase/commits/hbase-11339
> https://github.com/apache/hbase/commits/HBASE-11339
>
> I tried to delete the upper case HBASE-11339 branch but I don't seem to be
> able to:
>
> [stack@c2020 hbase.git.clean]$ git push origin :HBASE-11339
> error: no DAV locking support on
> https://git-wip-us.apache.org/repos/asf/hbase.git/
> fatal: git-http-push failed
>
> A search turns up: https://git-wip-us.apache.org/docs/common-errors.html
>
> but I'm already on https.
>
> Unless anyone else has ideas, I'll file INFRA ticket and ask them delete
> them delete the upper-case HBASE-11339  branch.
>
> Would appreciate those working on this stuff shouting if there is
> differences between the branches.
>
> Jon is on vacation so I'm game for helping out here.
>
> St.Ack
>
>
> On Mon, Nov 3, 2014 at 10:19 AM, Andrew Purtell <apurtell@apache.org>
> wrote:
>
>> This isn't just an annoyance. Clearly active dev is happening on
>> "hbase-11339", last commit:
>>
>> commit e5a1b86dbad650f9740eb24a7f544c4a51f05654
>>
>> Author: Jonathan M Hsieh <jmhsieh@apache.org>
>>
>> Date:   Thu Oct 30 06:50:13 2014 -0700
>>
>>
>>     HBASE-11683 Metrics for MOB (Jingcheng Du)
>>
>>
>> ​While on "HBASE-11339" it's ​
>>
>> commit 8a8b7de760a33c8195e287975d5b4a337d71b1fa
>>
>> Author: Ramkrishna <ramkrishna.s.vasudevan@intel.com>
>>
>> Date:   Fri Oct 31 15:43:58 2014 +0530
>>
>>
>>     HBASE-12392 Incorrect implementation of
>>
>>     CompactionRequest.isRetainDeleteMarkers(Jingcheng Du)
>>
>>
>> and this commit, HBASE-12392, is missing on "hbase-11339", so whatever it
>> is supposed to fix isn't fixed there.
>>
>> We need for someone working on MOB to commit HBASE-12392 into
>> "hbase-11339"
>> and then drop the "HBASE-11339" branch. Thanks!
>>
>> ​
>>
>> On Fri, Oct 31, 2014 at 6:04 PM, Nick Dimiduk <ndimiduk@gmail.com> wrote:
>>
>> > Looks like there are two branches for HBASE-11339; one is upper case and
>> > the other is lower case. This is breaking for me because the Mac
>> filesystem
>> > is not case sensitive. It appears the capitalized version was pushed
>> > unintentionally via this commit [0]. Would the folks working on this
>> > feature please delete one of the two branches and fix the situation for
>> us
>> > unfortunate mac users?
>> >
>> > Thanks,
>> > Nick
>> >
>> > [0]:
>> >
>> >
>> https://github.com/apache/hbase/commit/8a8b7de760a33c8195e287975d5b4a337d71b1fa
>> >
>> > On Fri, Oct 31, 2014 at 5:56 PM, Ted Yu <yuzhihong@gmail.com> wrote:
>> >
>> > > I got this earlier today.
>> > >
>> > > I had to re-clone my git workspace.
>> > >
>> > > Cheers
>> > >
>> > > On Oct 31, 2014, at 5:54 PM, Nick Dimiduk <ndimiduk@gmail.com> wrote:
>> > >
>> > > > Is anyone else seeing this? Seems like there was a forced push to
>> the
>> > > > hbase-11339 branch.
>> > > >
>> > > > $ git --no-pager fetch apache-rw
>> > > > error: Ref refs/remotes/apache-rw/hbase-11339 is at
>> > > > 8a8b7de760a33c8195e287975d5b4a337d71b1fa but expected
>> > > > aa523164e825567d93eb0b2a191955ca195ea242
>> > > > From https://git-wip-us.apache.org/repos/asf/hbase
>> > > > ! aa52316..e5a1b86  hbase-11339 -> apache-rw/hbase-11339  (unable
to
>> > > > update local ref)
>> > > > git exited abnormally with code 1.
>> > >
>> >
>>
>>
>>
>> --
>> Best regards,
>>
>>    - Andy
>>
>> Problems worthy of attack prove their worth by hitting back. - Piet Hein
>> (via Tom White)
>>
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message