You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@hbase.apache.org by Andrew Purtell <ap...@apache.org> on 2019/05/20 19:11:31 UTC
We have two branch-2.2s, delete one of them
From https://gitbox.apache.org/repos/asf/hbase
* [new branch] Branch-2.2 -> asf/Branch-2.2
+ ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced update)
Aside from the obvious confusion, this is going to be a problem on case
insensitive systems like MacOS.
--
Best regards,
Andrew
Words like orphans lost among the crosstalk, meaning torn from truth's
decrepit hands
- A23, Crosstalk
Re: We have two branch-2.2s, delete one of them
Posted by Stack <st...@duboce.net>.
hmm... I'm not doing forced updates on branch-2.2 though....
Let me see....
S
On Wed, May 22, 2019 at 1:17 PM Stack <st...@duboce.net> wrote:
> Looks like this was me (thanks William Shen).
>
> Sorry about that. Let me fix.
>
> S
>
> On Wed, May 22, 2019 at 11:18 AM Andrew Purtell <ap...@apache.org>
> wrote:
>
>> This issue is still happening. This is from a pull just now:
>>
>> From https://gitbox.apache.org/repos/asf/hbase
>> * [new branch] Branch-2.2 -> asf/Branch-2.2
>> + ac017188ac...5d6b07ab04 branch-2.2 -> asf/branch-2.2 (forced update)
>>
>> Whomever is pushing this bad ref, please take care of it or I will delete
>> both branches to force everyone to pay attention.
>>
>>
>>
>> On Mon, May 20, 2019 at 12:11 PM Andrew Purtell <ap...@apache.org>
>> wrote:
>>
>> > From https://gitbox.apache.org/repos/asf/hbase
>> > * [new branch] Branch-2.2 -> asf/Branch-2.2
>> > + ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced update)
>> >
>> > Aside from the obvious confusion, this is going to be a problem on case
>> > insensitive systems like MacOS.
>> >
>> > --
>> > Best regards,
>> > Andrew
>> >
>> > Words like orphans lost among the crosstalk, meaning torn from truth's
>> > decrepit hands
>> > - A23, Crosstalk
>> >
>>
>>
>> --
>> Best regards,
>> Andrew
>>
>> Words like orphans lost among the crosstalk, meaning torn from truth's
>> decrepit hands
>> - A23, Crosstalk
>>
>
Re: We have two branch-2.2s, delete one of them
Posted by William Shen <wi...@marinsoftware.com>.
Thanks Stack!
On Wed, May 22, 2019 at 3:05 PM Stack <st...@duboce.net> wrote:
> Yeah, looks like it was me....
>
> I deleted the branch and then pushed the one commit that was missing from
> the 'real' branch-2.2 (a revert of HBASE-22169).
>
> Thanks for raising the issue Mr. Purtell (and for the kick, William Shen).
>
> S
>
> On Wed, May 22, 2019 at 1:38 PM Andrew Purtell <an...@gmail.com>
> wrote:
>
> > Thanks Stack!
> >
> > > On May 22, 2019, at 1:17 PM, Stack <st...@duboce.net> wrote:
> > >
> > > Looks like this was me (thanks William Shen).
> > >
> > > Sorry about that. Let me fix.
> > >
> > > S
> > >
> > >> On Wed, May 22, 2019 at 11:18 AM Andrew Purtell <ap...@apache.org>
> > wrote:
> > >>
> > >> This issue is still happening. This is from a pull just now:
> > >>
> > >> From https://gitbox.apache.org/repos/asf/hbase
> > >> * [new branch] Branch-2.2 -> asf/Branch-2.2
> > >> + ac017188ac...5d6b07ab04 branch-2.2 -> asf/branch-2.2 (forced
> update)
> > >>
> > >> Whomever is pushing this bad ref, please take care of it or I will
> > delete
> > >> both branches to force everyone to pay attention.
> > >>
> > >>
> > >>
> > >> On Mon, May 20, 2019 at 12:11 PM Andrew Purtell <ap...@apache.org>
> > >> wrote:
> > >>
> > >>> From https://gitbox.apache.org/repos/asf/hbase
> > >>> * [new branch] Branch-2.2 -> asf/Branch-2.2
> > >>> + ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced
> update)
> > >>>
> > >>> Aside from the obvious confusion, this is going to be a problem on
> case
> > >>> insensitive systems like MacOS.
> > >>>
> > >>> --
> > >>> Best regards,
> > >>> Andrew
> > >>>
> > >>> Words like orphans lost among the crosstalk, meaning torn from
> truth's
> > >>> decrepit hands
> > >>> - A23, Crosstalk
> > >>>
> > >>
> > >>
> > >> --
> > >> Best regards,
> > >> Andrew
> > >>
> > >> Words like orphans lost among the crosstalk, meaning torn from truth's
> > >> decrepit hands
> > >> - A23, Crosstalk
> > >>
> >
>
Re: We have two branch-2.2s, delete one of them
Posted by Stack <st...@duboce.net>.
Yeah, looks like it was me....
I deleted the branch and then pushed the one commit that was missing from
the 'real' branch-2.2 (a revert of HBASE-22169).
Thanks for raising the issue Mr. Purtell (and for the kick, William Shen).
S
On Wed, May 22, 2019 at 1:38 PM Andrew Purtell <an...@gmail.com>
wrote:
> Thanks Stack!
>
> > On May 22, 2019, at 1:17 PM, Stack <st...@duboce.net> wrote:
> >
> > Looks like this was me (thanks William Shen).
> >
> > Sorry about that. Let me fix.
> >
> > S
> >
> >> On Wed, May 22, 2019 at 11:18 AM Andrew Purtell <ap...@apache.org>
> wrote:
> >>
> >> This issue is still happening. This is from a pull just now:
> >>
> >> From https://gitbox.apache.org/repos/asf/hbase
> >> * [new branch] Branch-2.2 -> asf/Branch-2.2
> >> + ac017188ac...5d6b07ab04 branch-2.2 -> asf/branch-2.2 (forced update)
> >>
> >> Whomever is pushing this bad ref, please take care of it or I will
> delete
> >> both branches to force everyone to pay attention.
> >>
> >>
> >>
> >> On Mon, May 20, 2019 at 12:11 PM Andrew Purtell <ap...@apache.org>
> >> wrote:
> >>
> >>> From https://gitbox.apache.org/repos/asf/hbase
> >>> * [new branch] Branch-2.2 -> asf/Branch-2.2
> >>> + ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced update)
> >>>
> >>> Aside from the obvious confusion, this is going to be a problem on case
> >>> insensitive systems like MacOS.
> >>>
> >>> --
> >>> Best regards,
> >>> Andrew
> >>>
> >>> Words like orphans lost among the crosstalk, meaning torn from truth's
> >>> decrepit hands
> >>> - A23, Crosstalk
> >>>
> >>
> >>
> >> --
> >> Best regards,
> >> Andrew
> >>
> >> Words like orphans lost among the crosstalk, meaning torn from truth's
> >> decrepit hands
> >> - A23, Crosstalk
> >>
>
Re: We have two branch-2.2s, delete one of them
Posted by Andrew Purtell <an...@gmail.com>.
Thanks Stack!
> On May 22, 2019, at 1:17 PM, Stack <st...@duboce.net> wrote:
>
> Looks like this was me (thanks William Shen).
>
> Sorry about that. Let me fix.
>
> S
>
>> On Wed, May 22, 2019 at 11:18 AM Andrew Purtell <ap...@apache.org> wrote:
>>
>> This issue is still happening. This is from a pull just now:
>>
>> From https://gitbox.apache.org/repos/asf/hbase
>> * [new branch] Branch-2.2 -> asf/Branch-2.2
>> + ac017188ac...5d6b07ab04 branch-2.2 -> asf/branch-2.2 (forced update)
>>
>> Whomever is pushing this bad ref, please take care of it or I will delete
>> both branches to force everyone to pay attention.
>>
>>
>>
>> On Mon, May 20, 2019 at 12:11 PM Andrew Purtell <ap...@apache.org>
>> wrote:
>>
>>> From https://gitbox.apache.org/repos/asf/hbase
>>> * [new branch] Branch-2.2 -> asf/Branch-2.2
>>> + ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced update)
>>>
>>> Aside from the obvious confusion, this is going to be a problem on case
>>> insensitive systems like MacOS.
>>>
>>> --
>>> Best regards,
>>> Andrew
>>>
>>> Words like orphans lost among the crosstalk, meaning torn from truth's
>>> decrepit hands
>>> - A23, Crosstalk
>>>
>>
>>
>> --
>> Best regards,
>> Andrew
>>
>> Words like orphans lost among the crosstalk, meaning torn from truth's
>> decrepit hands
>> - A23, Crosstalk
>>
Re: We have two branch-2.2s, delete one of them
Posted by Stack <st...@duboce.net>.
Looks like this was me (thanks William Shen).
Sorry about that. Let me fix.
S
On Wed, May 22, 2019 at 11:18 AM Andrew Purtell <ap...@apache.org> wrote:
> This issue is still happening. This is from a pull just now:
>
> From https://gitbox.apache.org/repos/asf/hbase
> * [new branch] Branch-2.2 -> asf/Branch-2.2
> + ac017188ac...5d6b07ab04 branch-2.2 -> asf/branch-2.2 (forced update)
>
> Whomever is pushing this bad ref, please take care of it or I will delete
> both branches to force everyone to pay attention.
>
>
>
> On Mon, May 20, 2019 at 12:11 PM Andrew Purtell <ap...@apache.org>
> wrote:
>
> > From https://gitbox.apache.org/repos/asf/hbase
> > * [new branch] Branch-2.2 -> asf/Branch-2.2
> > + ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced update)
> >
> > Aside from the obvious confusion, this is going to be a problem on case
> > insensitive systems like MacOS.
> >
> > --
> > Best regards,
> > Andrew
> >
> > Words like orphans lost among the crosstalk, meaning torn from truth's
> > decrepit hands
> > - A23, Crosstalk
> >
>
>
> --
> Best regards,
> Andrew
>
> Words like orphans lost among the crosstalk, meaning torn from truth's
> decrepit hands
> - A23, Crosstalk
>
Re: We have two branch-2.2s, delete one of them
Posted by Andrew Purtell <ap...@apache.org>.
This issue is still happening. This is from a pull just now:
From https://gitbox.apache.org/repos/asf/hbase
* [new branch] Branch-2.2 -> asf/Branch-2.2
+ ac017188ac...5d6b07ab04 branch-2.2 -> asf/branch-2.2 (forced update)
Whomever is pushing this bad ref, please take care of it or I will delete
both branches to force everyone to pay attention.
On Mon, May 20, 2019 at 12:11 PM Andrew Purtell <ap...@apache.org> wrote:
> From https://gitbox.apache.org/repos/asf/hbase
> * [new branch] Branch-2.2 -> asf/Branch-2.2
> + ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced update)
>
> Aside from the obvious confusion, this is going to be a problem on case
> insensitive systems like MacOS.
>
> --
> Best regards,
> Andrew
>
> Words like orphans lost among the crosstalk, meaning torn from truth's
> decrepit hands
> - A23, Crosstalk
>
--
Best regards,
Andrew
Words like orphans lost among the crosstalk, meaning torn from truth's
decrepit hands
- A23, Crosstalk
Re: We have two branch-2.2s, delete one of them
Posted by Andrew Purtell <ap...@apache.org>.
Also, let me call out the force push is highly problematic in its own
right. Maybe this is an attempt at repairing a mistake, but still. Please
exercise caution and diligence in branch maintenance. Please do not force
push without discussing with the community first. Please do not use git
commands that operate on the remote repository without double checking
them.
On Mon, May 20, 2019 at 12:11 PM Andrew Purtell <ap...@apache.org> wrote:
> From https://gitbox.apache.org/repos/asf/hbase
> * [new branch] Branch-2.2 -> asf/Branch-2.2
> + ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced update)
>
> Aside from the obvious confusion, this is going to be a problem on case
> insensitive systems like MacOS.
>
> --
> Best regards,
> Andrew
>
> Words like orphans lost among the crosstalk, meaning torn from truth's
> decrepit hands
> - A23, Crosstalk
>
--
Best regards,
Andrew
Words like orphans lost among the crosstalk, meaning torn from truth's
decrepit hands
- A23, Crosstalk
Re: We have two branch-2.2s, delete one of them
Posted by Andrew Purtell <ap...@apache.org>.
This is what the result can look like on MacOS:
error: cannot lock ref 'refs/remotes/asf-github/branch-2.2': is at
ac017188accd006a4d71001fd8362f1c3a2da456 but expected
89caa6b07a35a3eda2885f647eaab450572431d9
! 89caa6b07a..de10562bd9 branch-2.2 -> asf-github/branch-2.2 (unable to
update local ref)
I'm not sure if a remote only fix will be sufficient. Can retry after the
upstream repository has been repaired, but it might be necessary, after the
upstream repository has been repaired, to delete the local ref and recreate
it.
On Mon, May 20, 2019 at 12:11 PM Andrew Purtell <ap...@apache.org> wrote:
> From https://gitbox.apache.org/repos/asf/hbase
> * [new branch] Branch-2.2 -> asf/Branch-2.2
> + ac017188ac...de10562bd9 branch-2.2 -> asf/branch-2.2 (forced update)
>
> Aside from the obvious confusion, this is going to be a problem on case
> insensitive systems like MacOS.
>
> --
> Best regards,
> Andrew
>
> Words like orphans lost among the crosstalk, meaning torn from truth's
> decrepit hands
> - A23, Crosstalk
>
--
Best regards,
Andrew
Words like orphans lost among the crosstalk, meaning torn from truth's
decrepit hands
- A23, Crosstalk