hadoop-hdfs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Anu Engineer <aengin...@hortonworks.com>
Subject Re: Merge branch commit in trunk by mistake
Date Thu, 05 Jul 2018 21:10:00 GMT
Based on conversations with Giovanni and Subru, I have pushed a revert for this merge.

Thanks
Anu


On 7/5/18, 12:55 PM, "Giovanni Matteo Fumarola" <giovanni.fumarola@gmail.com> wrote:

    + common-dev and hdfs-dev as fyi.
    
    Thanks Subru and Sean for the answer.
    
    On Thu, Jul 5, 2018 at 12:14 PM, Subru Krishnan <subru@apache.org> wrote:
    
    > Looking at the merge commit, I feel it's better to reset/force push
    > especially since this is still the latest commit on trunk.
    >
    > I have raised an INFRA ticket requesting the same:
    > https://issues.apache.org/jira/browse/INFRA-16727
    >
    > -S
    >
    > On Thu, Jul 5, 2018 at 11:45 AM, Sean Busbey <busbey@cloudera.com.invalid>
    > wrote:
    >
    >> FYI, no images make it through ASF mailing lists. I presume the image was
    >> of the git history? If that's correct, here's what that looks like in a
    >> paste:
    >>
    >> https://paste.apache.org/eRix
    >>
    >> There are no force pushes on trunk, so backing the change out would
    >> require
    >> the PMC asking INFRA to unblock force pushes for a period of time.
    >>
    >> Probably the merge commit isn't a big enough deal to do that. There was a
    >> merge commit ~5 months ago for when YARN-6592 merged into trunk.
    >>
    >> So I'd say just try to avoid doing it in the future?
    >>
    >> -busbey
    >>
    >> On Thu, Jul 5, 2018 at 1:31 PM, Giovanni Matteo Fumarola <
    >> giovanni.fumarola@gmail.com> wrote:
    >>
    >> > Hi folks,
    >> >
    >> > After I pushed something on trunk a merge commit showed up in the
    >> history. *My
    >> > bad*.
    >> >
    >> >
    >> >
    >> > Since it was one of my first patches, I run a few tests on my machine
    >> > before checked in.
    >> > While I was running all the tests, someone else checked in. I correctly
    >> > pulled all the new changes.
    >> >
    >> > Even before I did the "git push" there was no merge commit in my
    >> history.
    >> >
    >> > Can someone help me reverting this change?
    >> >
    >> > Thanks
    >> > Giovanni
    >> >
    >> >
    >> >
    >>
    >>
    >> --
    >> busbey
    >>
    >
    >
    

Mime
View raw message