hadoop-mapreduce-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Wangda Tan <wheele...@gmail.com>
Subject Re: Merge branch commit in trunk by mistake
Date Thu, 05 Jul 2018 21:18:15 GMT
Adding back hdfs/common/mr-dev again to cc list.

Here's the last merge revert commit:
https://github.com/apache/hadoop/commit/39ad98903a5f042573b97a2e5438bc57af7cc7a1


On Thu, Jul 5, 2018 at 2:17 PM Wangda Tan <wheeleast@gmail.com> wrote:

> It looks like the latest revert is not correct, many of commits get
> reverted.
>
> Dealing with merge commit revert is different from reverting a normal
> commit: https://www.christianengvall.se/undo-pushed-merge-git/
>
> We have to do force reset, now it is a complete mess in trunk.
>
>
>
> On Thu, Jul 5, 2018 at 2:10 PM Vinod Kumar Vavilapalli <vinodkv@apache.org>
> wrote:
>
>> What is broken due to this merge commit?
>>
>> +Vinod
>>
>> > On Jul 5, 2018, at 2:03 PM, Arun Suresh <asuresh@apache.org> wrote:
>> >
>> > I agree with Sean, to be honest.. it is disruptive.
>> > Also, we have to kind of lock down the repo till it is completed..
>> >
>> > I recommend we be careful and try not to get into this situation again..
>> >
>> > -1 on force pushing..
>> >
>> > Cheers
>> > -Arun
>> >
>> > On Thu, Jul 5, 2018, 1:55 PM Sean Busbey <busbey@cloudera.com> wrote:
>> >
>> >> If we need a vote, please have a thread with either DISCUSS or
>> >> preferably VOTE in the subject so folks are more likely to see it.
>> >>
>> >> that said, I'm -1 (non-binding). force pushes are extremely
>> >> disruptive. there's no way to know who's updated their local git repo
>> >> to include these changes in the last few hours. if a merge commit is
>> >> so disruptive that we need to subject folks to the inconvenience of a
>> >> force push then we should have more tooling in place to avoid them
>> >> (like client side git hooks for all committers).
>> >>
>> >> On Thu, Jul 5, 2018 at 3:36 PM, Wangda Tan <wheeleast@gmail.com>
>> wrote:
>> >>> +1 for force reset the branch.
>> >>>
>> >>> 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
>> >>>>>
>> >>>>
>> >>
>> >>
>> >>
>> >> --
>> >> busbey
>> >>
>>
>>

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