asterixdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ian Maxon <ima...@uci.edu>
Subject Re: [IMPORTANT] Git issues
Date Wed, 15 Jul 2015 08:05:17 GMT
Oh, wait, where on earth did you get that commit? I put that up on the
old Gerrit instance to stage it, but both ASF and the real Gerrit
instance are still at c66d23a5ac65ec5218ee47134aea423fd62a32cc and
900bf1345410264e9b48469da93ccbd831920d2e, respectively. Were you
pulling from vitalstatistix?

On Wed, Jul 15, 2015 at 12:46 AM, Ian Maxon <imaxon@uci.edu> wrote:
> I didnt do it yet, so thats probably not the issue ;) . You're sure you
> added that email to your Gerrit account?
>
> -Ian
>
> On Jul 14, 2015 11:55 PM, "Ildar Absalyamov" <ildar.absalyamov@gmail.com>
> wrote:
>>
>> After Ian’s merge commit I am not able to submit a core review:
>>
>> remote: ERROR:  In commit a054ac0d342b94ab007321662696f29e9a7f8062
>> remote: ERROR:  committer email address ian@maxons.email
>> remote: ERROR:  does not match your user account.
>> remote: ERROR:
>> remote: ERROR:  The following addresses are currently registered:
>> remote: ERROR:    ildar.absalyamov@gmail.com
>> remote: ERROR:
>> remote: ERROR:  To register an email address, please visit:
>> remote: ERROR:  https://asterix-gerrit.ics.uci.edu/#/settings/contact
>> remote:
>>
>> > On Jul 14, 2015, at 20:30, Henry Saputra <henry.saputra@gmail.com>
>> > wrote:
>> >
>> > Chris,
>> >
>> > Let's figure out the best way to do it while adhering to ASF infra
>> > rules.
>> >
>> > I understand things are different in ASF that from outside but we need
>> > to figure out the right rather than either my way or none attitude.
>> >
>> > - Henry
>> >
>> > On Mon, Jul 13, 2015 at 3:48 PM, Chris Hillery <chillery@lambda.nu>
>> > wrote:
>> >> That is correct, and that doesn't need fixing - it is the correct
>> >> layout
>> >> for us.
>> >>
>> >> What needs fixing is finding a way to prevent accidentally pushing to
>> >> the
>> >> wrong git remote. Unfortunately the ASF repositories don't offer any
>> >> permissions or other mechanisms to help; in fact they require us to set
>> >> up
>> >> the "wrong" way.
>> >>
>> >> My recommendation would be for all devs to pull from the github ASF
>> >> mirror
>> >> and push to Gerrit, and not have a remote for ASF at all.
>> >>
>> >> Ceej
>> >> aka Chris Hillery
>> >> On Jul 13, 2015 3:34 PM, "Jochen Wiedmann" <jochen.wiedmann@gmail.com>
>> >> wrote:
>> >>
>> >>> Hi, Ian,
>> >>>
>> >>> the information that I read from your mail is that there are currently
>> >>> two Git repositories in use: One being the "official apache
>> >>> repository", the other being the repository with the "Gerrit master
>> >>> branch".
>> >>>
>> >>> Is that impression correct? If so, what are the reasons? And what can
>> >>> we do to fix that?
>> >>>
>> >>> Thanks,
>> >>>
>> >>> Jochen
>> >>>
>> >>>
>> >>> On Mon, Jul 13, 2015 at 9:01 PM, Ian Maxon <imaxon@uci.edu> wrote:
>> >>>> Hey all,
>> >>>> If you haven't pulled from
>> >>>> https://git-wip-us.apache.org/repos/asf?p=incubator-asterixdb.git
>> >>>> (i.e. asterixdb's official apache repository) lately, please don't
>> >>>> until you get an email giving the all-clear. Same goes for submitting
>> >>>> and merging patches from Gerrit. Something inadvertently got
>> >>>> committed
>> >>>> to the head of the ASF master branch, which does not exactly agree
>> >>>> with the head of Gerrit's master branch, so they are diverged at
the
>> >>>> moment.
>> >>>>
>> >>>> Additionally, if in your AsterixDB repository, 'git rev-parse
>> >>>> asf/master' returns c66d23a5ac65ec5218ee47134aea423fd62a32cc , please
>> >>>> reply to this so we know who might be affected. This means you have
>> >>>> the latest from the ASF repository- which we may have to force-push
>> >>>> and overwrite the latest commit from.
>> >>>>
>> >>>> Thanks,
>> >>>> -Ian
>> >>>
>> >>>
>> >>>
>> >>> --
>> >>> Any world that can produce the Taj Mahal, William Shakespeare,
>> >>> and Stripe toothpaste can't be all bad. (C.R. MacNamara, One Two
>> >>> Three)
>> >>>
>>
>> Best regards,
>> Ildar
>>
>

Mime
View raw message