Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-27 Thread Karthik Kambatla
Filed https://issues.apache.org/jira/browse/INFRA-11136 On Mon, Jan 25, 2016 at 3:41 PM, Vinod Kumar Vavilapalli wrote: > I believe this is still in place, though I am not sure how we can verify > this (without doing a force-push of course) > > +Vinod > > > One thing that

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-25 Thread Vinod Kumar Vavilapalli
dev@hadoop.apache.org > <mailto:hdfs-dev@hadoop.apache.org>; mapreduce-...@hadoop.apache.org > <mailto:mapreduce-...@hadoop.apache.org>; Vinod Kumar Vavilapalli > Subject: Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale > branches > > Thanks

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-25 Thread Vinod Kumar Vavilapalli
I believe this is still in place, though I am not sure how we can verify this (without doing a force-push of course) +Vinod > One thing that wasn't clear from the INFRA announcement: are trunk, > branch-* branches protected against force-pushes in the new world? If not, > should we ask them to

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-17 Thread Karthik Kambatla
+1 on all counts. One thing that wasn't clear from the INFRA announcement: are trunk, branch-* branches protected against force-pushes in the new world? If not, should we ask them to be locked up? Thanks Karthik On Thu, Jan 14, 2016 at 10:26 PM, Vinod Kumar Vavilapalli < vino...@apache.org>

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-15 Thread Junping Du
e <sj...@apache.org> Sent: Friday, January 15, 2016 7:17 AM To: yarn-...@hadoop.apache.org Cc: Hadoop Common; hdfs-dev@hadoop.apache.org; mapreduce-...@hadoop.apache.org; Vinod Kumar Vavilapalli Subject: Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches Thanks Vinod for the proposa

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-15 Thread Sangjin Lee
t; sj...@apache.org> > Sent: Friday, January 15, 2016 7:17 AM > To: yarn-...@hadoop.apache.org > Cc: Hadoop Common; hdfs-dev@hadoop.apache.org; > mapreduce-...@hadoop.apache.org; Vinod Kumar Vavilapalli > Subject: Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale > branc

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-14 Thread Akira AJISAKA
Thanks Vinod for the information. +1 for removing origin/bracnh-2.8 and origin/sjlee/hdfs-merge. In addition, I'm thinking we need to delete origin/master, which was pushed wrongly. I've already deleted origin/ajisakaa/common-merge before force-push protection starts. > — There is a general

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-14 Thread Yongjun Zhang
Thanks Vinod and Akira.. I assume we will have at least a committer review of any force-push. Say, if the commit history already has x, y, z, now we need to force push with x', we'd better not torget y and z, and if there is conflict putting in y and z after x', the conflict is better reviewed.

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-14 Thread Vinod Kumar Vavilapalli
It kind of got lost through my email, but when I talked about force-push, it is almost completely in the context of feature-branch rebase. We almost never do force-push outside of this context, neither do we encourage it. And like I pointed, the fact that the mainline branches (trunk, branch-2

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-14 Thread Yongjun Zhang
Thanks for clarifying Vinod.That sounds good to me. --Yongjun On Thu, Jan 14, 2016 at 9:04 PM, Vinod Kumar Vavilapalli wrote: > It kind of got lost through my email, but when I talked about force-push, > it is almost completely in the context of feature-branch rebase. > >

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-14 Thread Sangjin Lee
Thanks Vinod for the proposal. I deleted my branch (sjlee/hdfs-merge) the other day. Sangjin On Thu, Jan 14, 2016 at 1:26 PM, Vinod Kumar Vavilapalli wrote: > Hi all, > > As some of you have noticed, we have an update from ASF infra on git > branching policy: We no longer

[UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-14 Thread Vinod Kumar Vavilapalli
Hi all, As some of you have noticed, we have an update from ASF infra on git branching policy: We no longer have a ASF wide mandate on disallowing force-pushes on all branches / tags. Summarizing information from the INFRA email for the sake of clarity in the midst of recent confusion - We

Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale branches

2016-01-14 Thread Vinod Kumar Vavilapalli
Mailing infra ate all the formatting up. Here’s the same email with some line breaks. > Hi all, > > As some of you have noticed, we have an update from ASF infra on git > branching policy: We no longer have a ASF wide mandate on disallowing > force-pushes on all branches / tags. >