You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@metron.apache.org by "Zeolla@GMail.com" <ze...@gmail.com> on 2017/09/09 00:52:03 UTC
Unclear recent commit
I was looking through some of the recent commits and I noticed this[1],
anybody know what the back story is there?
1:
https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8a58265148a
Jon
--
Jon
Re: Unclear recent commit
Posted by Casey Stella <ce...@gmail.com>.
That's very weird.
On Fri, Sep 8, 2017 at 10:12 PM, Otto Fowler <ot...@gmail.com>
wrote:
> without re-writing my other reply:
> I use the prepare-commit into a clean repo every time, so I believe that
> this issue
> *was* in the apache repo.
>
>
> On September 8, 2017 at 22:08:02, Casey Stella (cestella@gmail.com) wrote:
>
> My guess is that what happened was otto did a pull of METRON-1061 into his
> master, but it wasn't *quite* in sync with master in apache and there was
> a
> conflict in the dependencies_with_url.csv, so that commit was made locally
> to fix the conflict. both commits, the squashed and the merge conflict
> commit were pushed to apache master.
>
> Otto, is that correct or am I just babbling on a friday night late? ;)
>
> On Fri, Sep 8, 2017 at 8:52 PM, Zeolla@GMail.com <ze...@gmail.com>
> wrote:
>
> > I was looking through some of the recent commits and I noticed this[1],
> > anybody know what the back story is there?
> >
> > 1:
> > https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8
> > a58265148a
> >
> > Jon
> > --
> >
> > Jon
> >
>
>
Re: Unclear recent commit
Posted by Otto Fowler <ot...@gmail.com>.
without re-writing my other reply:
I use the prepare-commit into a clean repo every time, so I believe that
this issue
*was* in the apache repo.
On September 8, 2017 at 22:08:02, Casey Stella (cestella@gmail.com) wrote:
My guess is that what happened was otto did a pull of METRON-1061 into his
master, but it wasn't *quite* in sync with master in apache and there was a
conflict in the dependencies_with_url.csv, so that commit was made locally
to fix the conflict. both commits, the squashed and the merge conflict
commit were pushed to apache master.
Otto, is that correct or am I just babbling on a friday night late? ;)
On Fri, Sep 8, 2017 at 8:52 PM, Zeolla@GMail.com <ze...@gmail.com> wrote:
> I was looking through some of the recent commits and I noticed this[1],
> anybody know what the back story is there?
>
> 1:
> https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8
> a58265148a
>
> Jon
> --
>
> Jon
>
Re: Unclear recent commit
Posted by Casey Stella <ce...@gmail.com>.
My guess is that what happened was otto did a pull of METRON-1061 into his
master, but it wasn't *quite* in sync with master in apache and there was a
conflict in the dependencies_with_url.csv, so that commit was made locally
to fix the conflict. both commits, the squashed and the merge conflict
commit were pushed to apache master.
Otto, is that correct or am I just babbling on a friday night late? ;)
On Fri, Sep 8, 2017 at 8:52 PM, Zeolla@GMail.com <ze...@gmail.com> wrote:
> I was looking through some of the recent commits and I noticed this[1],
> anybody know what the back story is there?
>
> 1:
> https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8
> a58265148a
>
> Jon
> --
>
> Jon
>
Re: Unclear recent commit
Posted by Nick Allen <ni...@nickallen.org>.
I don't think this instance is a big deal. But ideally I think any
changes, including a fix like this, should go through the PR process.
On Fri, Sep 8, 2017 at 10:44 PM Casey Stella <ce...@gmail.com> wrote:
> So, generally the goal is to commit the minimal set of commits squashed by
> contributor. For situations that are wacky and end up with a conflict, I
> don't think it's a problem. No worries, IMO.
>
> On Fri, Sep 8, 2017 at 10:29 PM, Otto Fowler <ot...@gmail.com>
> wrote:
>
> > Is what I did against policy? What should I have done?
> > I think the committer’s guide is archived btw.
> >
> >
> > On September 8, 2017 at 22:12:27, Casey Stella (cestella@gmail.com)
> wrote:
> >
> > I don't have an issue with this; it's good to have the explanation. I
> also
> > found that we weren't running the dependency analyzer as part of travis
> > (or, we thought we were, but we weren't) until METRON-1169. Thanks otto
> > for the explanation and jon for catching it.
> >
> > On Fri, Sep 8, 2017 at 10:09 PM, Otto Fowler <ot...@gmail.com>
> > wrote:
> >
> > > Yes, that was me.
> > >
> > > I was committing a pr, and got an error on this while building and
> > testing.
> > > it was introduced by an earlier pr. I sent an email to the list at the
> > > time:
> > >
> > > http://mail-archives.apache.org/mod_mbox/metron-dev/
> > > 201708.mbox/%3cCAO2EVT6q-Dcgjs3_DCGjaNXaUyfX-S7ZGn+
> > > mFcmpkHuAK9tbgQ@mail.gmail.com%3e
> > >
> > > Basically, while preparing a commit, verify lic. failed because of a
> > > previously committed dependency change ( which went in without verify
> > being
> > > run I can only assume ).
> > > I fixed the issue in my commit repo and pushed that commit with the pr
> > > commit after re-testing etc.
> > >
> > >
> > >
> > > On September 8, 2017 at 20:52:20, Zeolla@GMail.com (zeolla@gmail.com)
> > > wrote:
> > >
> > > I was looking through some of the recent commits and I noticed this[1],
> > > anybody know what the back story is there?
> > >
> > > 1:
> > > https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8
> > > a58265148a
> > >
> > > Jon
> > > --
> > >
> > > Jon
> > >
> >
> >
>
Re: Unclear recent commit
Posted by Casey Stella <ce...@gmail.com>.
So, generally the goal is to commit the minimal set of commits squashed by
contributor. For situations that are wacky and end up with a conflict, I
don't think it's a problem. No worries, IMO.
On Fri, Sep 8, 2017 at 10:29 PM, Otto Fowler <ot...@gmail.com>
wrote:
> Is what I did against policy? What should I have done?
> I think the committer’s guide is archived btw.
>
>
> On September 8, 2017 at 22:12:27, Casey Stella (cestella@gmail.com) wrote:
>
> I don't have an issue with this; it's good to have the explanation. I also
> found that we weren't running the dependency analyzer as part of travis
> (or, we thought we were, but we weren't) until METRON-1169. Thanks otto
> for the explanation and jon for catching it.
>
> On Fri, Sep 8, 2017 at 10:09 PM, Otto Fowler <ot...@gmail.com>
> wrote:
>
> > Yes, that was me.
> >
> > I was committing a pr, and got an error on this while building and
> testing.
> > it was introduced by an earlier pr. I sent an email to the list at the
> > time:
> >
> > http://mail-archives.apache.org/mod_mbox/metron-dev/
> > 201708.mbox/%3cCAO2EVT6q-Dcgjs3_DCGjaNXaUyfX-S7ZGn+
> > mFcmpkHuAK9tbgQ@mail.gmail.com%3e
> >
> > Basically, while preparing a commit, verify lic. failed because of a
> > previously committed dependency change ( which went in without verify
> being
> > run I can only assume ).
> > I fixed the issue in my commit repo and pushed that commit with the pr
> > commit after re-testing etc.
> >
> >
> >
> > On September 8, 2017 at 20:52:20, Zeolla@GMail.com (zeolla@gmail.com)
> > wrote:
> >
> > I was looking through some of the recent commits and I noticed this[1],
> > anybody know what the back story is there?
> >
> > 1:
> > https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8
> > a58265148a
> >
> > Jon
> > --
> >
> > Jon
> >
>
>
Re: Unclear recent commit
Posted by Otto Fowler <ot...@gmail.com>.
Is what I did against policy? What should I have done?
I think the committer’s guide is archived btw.
On September 8, 2017 at 22:12:27, Casey Stella (cestella@gmail.com) wrote:
I don't have an issue with this; it's good to have the explanation. I also
found that we weren't running the dependency analyzer as part of travis
(or, we thought we were, but we weren't) until METRON-1169. Thanks otto
for the explanation and jon for catching it.
On Fri, Sep 8, 2017 at 10:09 PM, Otto Fowler <ot...@gmail.com>
wrote:
> Yes, that was me.
>
> I was committing a pr, and got an error on this while building and
testing.
> it was introduced by an earlier pr. I sent an email to the list at the
> time:
>
> http://mail-archives.apache.org/mod_mbox/metron-dev/
> 201708.mbox/%3cCAO2EVT6q-Dcgjs3_DCGjaNXaUyfX-S7ZGn+
> mFcmpkHuAK9tbgQ@mail.gmail.com%3e
>
> Basically, while preparing a commit, verify lic. failed because of a
> previously committed dependency change ( which went in without verify
being
> run I can only assume ).
> I fixed the issue in my commit repo and pushed that commit with the pr
> commit after re-testing etc.
>
>
>
> On September 8, 2017 at 20:52:20, Zeolla@GMail.com (zeolla@gmail.com)
> wrote:
>
> I was looking through some of the recent commits and I noticed this[1],
> anybody know what the back story is there?
>
> 1:
> https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8
> a58265148a
>
> Jon
> --
>
> Jon
>
Re: Unclear recent commit
Posted by Casey Stella <ce...@gmail.com>.
I don't have an issue with this; it's good to have the explanation. I also
found that we weren't running the dependency analyzer as part of travis
(or, we thought we were, but we weren't) until METRON-1169. Thanks otto
for the explanation and jon for catching it.
On Fri, Sep 8, 2017 at 10:09 PM, Otto Fowler <ot...@gmail.com>
wrote:
> Yes, that was me.
>
> I was committing a pr, and got an error on this while building and testing.
> it was introduced by an earlier pr. I sent an email to the list at the
> time:
>
> http://mail-archives.apache.org/mod_mbox/metron-dev/
> 201708.mbox/%3cCAO2EVT6q-Dcgjs3_DCGjaNXaUyfX-S7ZGn+
> mFcmpkHuAK9tbgQ@mail.gmail.com%3e
>
> Basically, while preparing a commit, verify lic. failed because of a
> previously committed dependency change ( which went in without verify being
> run I can only assume ).
> I fixed the issue in my commit repo and pushed that commit with the pr
> commit after re-testing etc.
>
>
>
> On September 8, 2017 at 20:52:20, Zeolla@GMail.com (zeolla@gmail.com)
> wrote:
>
> I was looking through some of the recent commits and I noticed this[1],
> anybody know what the back story is there?
>
> 1:
> https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8
> a58265148a
>
> Jon
> --
>
> Jon
>
Re: Unclear recent commit
Posted by Otto Fowler <ot...@gmail.com>.
Yes, that was me.
I was committing a pr, and got an error on this while building and testing.
it was introduced by an earlier pr. I sent an email to the list at the
time:
http://mail-archives.apache.org/mod_mbox/metron-dev/201708.mbox/%3cCAO2EVT6q-Dcgjs3_DCGjaNXaUyfX-S7ZGn+mFcmpkHuAK9tbgQ@mail.gmail.com%3e
Basically, while preparing a commit, verify lic. failed because of a
previously committed dependency change ( which went in without verify being
run I can only assume ).
I fixed the issue in my commit repo and pushed that commit with the pr
commit after re-testing etc.
On September 8, 2017 at 20:52:20, Zeolla@GMail.com (zeolla@gmail.com) wrote:
I was looking through some of the recent commits and I noticed this[1],
anybody know what the back story is there?
1:
https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8a58265148a
Jon
--
Jon