mxnet-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Marco de Abreu <marco.g.ab...@googlemail.com>
Subject Re: Accidental commits to 1.2.0 branch using Maven apache-release profile
Date Sat, 09 Jun 2018 21:05:59 GMT
Would there be any benefit besides cosmetics? I'd propose to just leave it
as-is.

Tianqi Chen <tqchen@cs.washington.edu> schrieb am Sa., 9. Juni 2018, 22:28:

> This would only happen if somebody pushed some changes on these new commits
> pushed 1.2.0 branch.
>
> That is if I checked out 1.2.0 before the change is pushed, and rebase
> against the code after squash, it will be fine. The problem will only
> happen if someone checked out 1.2.0 after these commits get in, push their
> own changes, then try to rebase
>
> Tianqi
>
> On Sat, Jun 9, 2018 at 1:25 PM, Marco de Abreu <
> marco.g.abreu@googlemail.com
> > wrote:
>
> > It would be a history rewrite. Everybody would receive an error if they
> > checked out the branch and try to merge or rebase.
> >
> > Naveen Swamy <mnnaveen@gmail.com> schrieb am Sa., 9. Juni 2018, 22:21:
> >
> > > 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 <
> > > marco.g.abreu@googlemail.com
> > > > 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 <mnnaveen@gmail.com> 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 <limu.cn@gmail.com>
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 <
> > > > > marco.g.abreu@googlemail.com>
> > > > > > wrote:
> > > > > > >
> > > > > > > Ah yeah that's exactly what I mean :)
> > > > > > >
> > > > > > > Naveen Swamy <mnnaveen@gmail.com> 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 <
> > > > > > >> marco.g.abreu@googlemail.com
> > > > > > >>> 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 <mnnaveen@gmail.com> 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
> > > > > > >>>>
> > > > > > >>>
> > > > > > >>
> > > > > >
> > > > >
> > > >
> > >
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message