Re: Merge branch commit in trunk by mistake

2018-07-05 Thread Anu Engineer
I ran “git revert -c c163d1797ade0f47d35b4a44381b8ef1dfec5b60 -m 1” that will remove all changes from Giovanni’s branch (There are 3 YARN commits). I am presuming that he can recommit the dropped changes directly into trunk. I do not know off a better way than to lose changes from his branch. I

Re: Merge branch commit in trunk by mistake

2018-07-05 Thread Wangda Tan
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 wrote: > It looks like the latest revert is not correct, many of commits get > revert

Re: Merge branch commit in trunk by mistake

2018-07-05 Thread Wangda Tan
+ hdfs-dev/common-dev/mapreduce-dev On Thu, Jul 5, 2018 at 2:09 PM Sunil G wrote: > I just see that this is reverted. > > commit 39ad98903a5f042573b97a2e5438bc57af7cc7a1 (origin/trunk, origin/HEAD) > Author: Anu Engineer > Date: Thu Jul 5 12:22:18 2018 -0700 > > Revert "Merge branch 'trun

Re: Merge branch commit in trunk by mistake

2018-07-05 Thread Anu Engineer
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" 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 Krishn

Re: Merge branch commit in trunk by mistake

2018-07-05 Thread Giovanni Matteo Fumarola
+ 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 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 req