I agree we should never rewrite history on the master branch, master branch is protected so you won't be able to push to it without a PR. The issue here was the release branch was not protected.
I am only squashing commits that are after the tag creation. On Sat, Jun 9, 2018 at 1:24 PM, Tianqi Chen <[email protected]> wrote: > One potential problem is that, if a release is tagged to a certain hash > code, and that specific commit get squashed, the previous tagged release is > no longer valid, so at least make sure that did not happen > > Tianqi > > On Sat, Jun 9, 2018 at 1:23 PM, Tianqi Chen <[email protected]> > wrote: > > > You should never force push to master branch because it messes up > people's > > commit history. Ideally, you shall never push to the release branch and > PR > > is preferred. Given no people will continue work on the release branch, > the > > impact of squash commits is minimalized and is fine in this case, given > > likely most people works on master > > > > Tianqi > > > > On Sat, Jun 9, 2018 at 1:20 PM, Naveen Swamy <[email protected]> wrote: > > > >> how would it be devastating? it is just squashing a bunch of commits > >> together into 1 commit. > >> > >> On Sat, Jun 9, 2018 at 1:18 PM, Marco de Abreu < > >> [email protected] > >> > wrote: > >> > >> > I think we should never ever force push to a publish repository since > we > >> > don't know what depends on it. I'd say we take this as a lesson > learned > >> and > >> > leave it as it is. > >> > > >> > The impact could be way more devastating than the benefits > >> > > >> > -Marco > >> > > >> > Naveen Swamy <[email protected]> schrieb am Sa., 9. Juni 2018, > 21:39: > >> > > >> > > Hi Mu, > >> > > > >> > > No, it isn't necessary to have those commits. I did not want to > >> rewrite > >> > the > >> > > history, thats why I did not attempt. I can try to squash and force > >> push, > >> > > I'll let you know if I am able to force-push. > >> > > > >> > > Thanks, Naveen > >> > > > >> > > > >> > > > >> > > On Sat, Jun 9, 2018 at 12:28 PM, Mu Li <[email protected]> wrote: > >> > > > >> > > > Hi Naveen, > >> > > > > >> > > > Thanks for the clarification. Is there necessary to keep these > >> commits > >> > > > submitted by the maveen plugin in the repo? Otherwise, can we > squash > >> > > these > >> > > > commits and force push it to a single commit? It's good to have a > >> > stable > >> > > > release only patched with meaningful commits. > >> > > > > >> > > > Best, > >> > > > Mu > >> > > > > >> > > > > On Jun 7, 2018, at 2:55 PM, Marco de Abreu < > >> > > [email protected]> > >> > > > wrote: > >> > > > > > >> > > > > Ah yeah that's exactly what I mean :) > >> > > > > > >> > > > > Naveen Swamy <[email protected]> schrieb am Do., 7. Juni 2018, > >> > 23:54: > >> > > > > > >> > > > >> May be, but I have disabled it taking any action, so I don't > see > >> a > >> > > need > >> > > > to > >> > > > >> do it on a private fork. I am reviewing the local changes and > >> make a > >> > > PR > >> > > > >> after that. > >> > > > >> > >> > > > >> On Thu, Jun 7, 2018 at 2:41 PM, Marco de Abreu < > >> > > > >> [email protected] > >> > > > >>> wrote: > >> > > > >> > >> > > > >>> Hello Naveen, > >> > > > >>> > >> > > > >>> thank you for addressing this. Is it possible to let the > plugin > >> > point > >> > > > to > >> > > > >> a > >> > > > >>> private fork so you can review it's actions manually before > they > >> > are > >> > > > >>> written to the main repository? That way, we could just open a > >> PR > >> > and > >> > > > >>> double check everything is as expected. > >> > > > >>> > >> > > > >>> Thanks a lot for taking care of the Scala releases! > >> > > > >>> > >> > > > >>> Best regards, > >> > > > >>> Marco > >> > > > >>> > >> > > > >>> Naveen Swamy <[email protected]> schrieb am Do., 7. Juni > 2018, > >> > > 23:27: > >> > > > >>> > >> > > > >>>> Hello all, > >> > > > >>>> > >> > > > >>>> I want to bring to your attention that there have been some > >> > > accidental > >> > > > >>>> commits to the 1.2.0 branch on my behalf. This was done by > the > >> > Maven > >> > > > >>>> apache-release plugin while I was working on building a > >> package to > >> > > > >>> publish > >> > > > >>>> to Maven. > >> > > > >>>> When you use apache-release profile in your profile by > default > >> it > >> > > > >> updates > >> > > > >>>> the package version number, create a tag on the remote repo > and > >> > > commit > >> > > > >>> all > >> > > > >>>> the changes from local. This is how my WIP commits got into > >> 1.2.0 > >> > > > which > >> > > > >>> was > >> > > > >>>> not protected. > >> > > > >>>> I have disabled this capability in my current PR > >> > > > >>>> https://github.com/apache/incubator-mxnet/pull/11147/. This > is > >> > also > >> > > > >>>> necessary since we need to publish on multiple > >> > > > >>> platforms(osx/linux-cpu/gpu) > >> > > > >>>> > >> > > > >>>> -Naveen > >> > > > >>>> > >> > > > >>> > >> > > > >> > >> > > > > >> > > > >> > > >> > > > > >
