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
I have the merge commit version locally; let me push it out to github
OK...its on
https://github.com/steveloughran/hadoop/tree/s3guard/HADOOP-15583-ddb-credentials
* c163d1797ad - (HEAD -> s3guard/HADOOP-15583-ddb-credentials,
gerrit/apache-ref/trunk, apache/trunk, trunk) Merge branch 'trunk
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
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
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
What is broken due to this merge commit?
+Vinod
> On Jul 5, 2018, at 2:03 PM, Arun Suresh 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 aga
+ 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
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 'trunk' of
https://git-wip-us.apache.org/repos/asf/hadoop into trunk"
This reverts commit c163d17
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 wrote:
> If we need a vot
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 f
+1 for force reset the branch.
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 requesting the same:
> https://issues.apache.o
+ 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
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
wrote:
> FYI, no i
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
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 befor
15 matches
Mail list logo