On Chris Douglas' advise I filed a ticket with INFRA to go back and fix this, and if possible disallow even forward merges for branches in which we don't have force-push.
Ticket: INFRA-11248 Thanks, Carlo -----Original Message----- From: Carlo Curino [mailto:[email protected]] Sent: Wednesday, February 10, 2016 1:53 PM To: [email protected] Subject: RE: Merge commit pushed to trunk... should we fix it? should it happen? That sounds plausible. Cheers, Carlo -----Original Message----- From: Vinod Kumar Vavilapalli [mailto:[email protected]] Sent: Wednesday, February 10, 2016 11:18 AM To: [email protected] Subject: Re: Merge commit pushed to trunk... should we fix it? should it happen? We already have force-push rejects in place. So, you won’t be able to ‘fix’ it now. Seems like this was a simple forward merge and that is why it went through? Thanks +Vinod > On Feb 10, 2016, at 10:41 AM, Carlo Curino <[email protected]> wrote: > > Hi Guys, > > I have a question, I mistakenly do git pull (instead of git pull > -rebase), and thus I had a Merge patch entry, which got pushed to > trunk. I was under the impression (and so was Arun Suresh and Chris Douglas) > that this should not be possible. (git log -graph shown below). > > Now I have two questions: > > 1) Shall I try to fix it? And how do you think this should be done to > keep things clean. > > 2) Should we try to make the infrastructure reject this type of things? > > Thanks and sorry for this, > Carlo > > > > * commit c3641ed3b183fa46e6b042fd19c1a373b8f95d33 > |\ Merge: b706cbc bc425a6 > | | Author: = <[email protected]> > | | Date: Wed Feb 10 10:24:18 2016 -0800 > | | > | | Merge branch 'trunk' of > | | https://na01.safelinks.protection.outlook.com/?url=https%3a%2f%2fg > | | it-wip-us.apache.org%2frepos%2fasf%2fhadoop&data=01%7c01%7cCCURINO > | | %40exchange.microsoft.com%7cf3abf488cda24a0d89f908d3324ef210%7c72f > | | 988bf86f141af91ab2d7cd011db47%7c1&sdata=bxhMSsvDty%2bezScQbpxM5osZ > | | YOWVzWqv2zYG%2fpYecpM%3d into trunk > | | > | * commit bc425a623fd06c4f56106fb2ea662b19e4434d11 > | | Author: Karthik Kambatla <[email protected]> > | | Date: Wed Feb 10 10:08:05 2016 -0800 > | | > | | HDFS-9637. Tests for RollingFileSystemSink. (Daniel Templeton > | | via kasha) > | | > * | commit b706cbc1bc0ab3572c01676fe7365df21eda7ffa > |/ Author: = <[email protected]> > | Date: Wed Feb 10 10:19:26 2016 -0800 > | > | YARN-4420. Add REST API for List Reservations (Sean Po via > | curino) > | > * commit 4ef1324ff66fe6c5ffbb828143e231fcafb143a9 > | Author: Zhe Zhang <[email protected]> > | Date: Wed Feb 10 09:56:40 2016 -0800 > | > | HADOOP-12764. Increase default value of KMX maxHttpHeaderSize and make > it configurable. > | > | Change-Id: I6e970563c201152e1428feafb8124e61c15a6fc0
