The rest of this thread is about having folks make release notes changes to the
release branch.
It is totally fine and encouraged to ask the RM before committing as Greg did
at the start of the thread. Cherry picking still can lead to merge issues
later. Best if a commit goes in the right branch.
-Alex
On 4/20/20, 12:17 PM, "Josh Tynjala" <joshtynj...@bowlerhat.dev> wrote:
I'd rather not commit to a release branch unless the RM explicitly tells me
to, so I just thought I'd mention what I did.
--
Josh Tynjala
Bowler Hat LLC
<https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbowlerhat.dev%2F&data=02%7C01%7Caharui%40adobe.com%7C8c0bbd636f1948da818f08d7e55f7033%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637230070384701851&sdata=Fjf63iEAgXuXc3j3p9C0K8IacWpHIITeb7RAKWHwCLE%3D&reserved=0>
On Mon, Apr 20, 2020 at 11:57 AM Alex Harui <aha...@adobe.com.invalid>
wrote:
> Dev branch is at 0.9.8, so that's when your changes will go out,.
>
> -Alex
>
> On 4/20/20, 9:47 AM, "Josh Tynjala" <joshtynj...@bowlerhat.dev> wrote:
>
> I added some 0.9.7 release notes for both royale-compiler and
> royale-asjs.
> I committed them to develop, though, so feel free to cherry-pick or
> whatever.
>
> --
> Josh Tynjala
> Bowler Hat LLC <
>
https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbowlerhat.dev%2F&data=02%7C01%7Caharui%40adobe.com%7C8c0bbd636f1948da818f08d7e55f7033%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637230070384701851&sdata=Fjf63iEAgXuXc3j3p9C0K8IacWpHIITeb7RAKWHwCLE%3D&reserved=0
> >
>
>
> On Sun, Apr 19, 2020 at 6:21 AM Carlos Rovira <carlosrov...@apache.org
> >
> wrote:
>
> > Hi Greg
> >
> > for compiler: just added improvements to maven by Chris Dutz and
> Maven
> > Distribution (that's now working) to create SDK with Maven
> > I think in compiler Josh should add many of his improvements
> >
> > Going to check framework
> >
> > thanks
> >
> > Carlos
> >
> >
> >
> > El dom., 19 abr. 2020 a las 2:02, Greg Dove (<greg.d...@gmail.com>)
> > escribió:
> >
> > > I pushed some changes to both compiler and asjs release notes in
> branch
> > > release/0.9.7
> > >
> > > I'd like to suggest that others review this and add more as needed
> (as
> > > opposed to waiting until late in the process to do it).
> > >
> > >
> > > On Sat, Apr 18, 2020 at 11:25 AM Greg Dove <greg.d...@gmail.com>
> wrote:
> > >
> > > > Ok, thanks for clarifying Alex. I will do that later today.
> > > >
> > > >
> > > > On Sat, Apr 18, 2020 at 11:03 AM Alex Harui
> <aha...@adobe.com.invalid>
> > > > wrote:
> > > >
> > > >> IMO, there is no perfect solution. There will be times where
> the
> > > release
> > > >> branch is so broken that it will be tossed and re-cut from
> develop.
> > But
> > > >> this time around we are trying to keep the release branches
> around, so
> > > make
> > > >> changes to the release branch and make sure the RM knows so
> they RM
> > > knows
> > > >> to merge changes back in case we get to the toss-and-re-cut
> point.
> > > >>
> > > >> Thanks,
> > > >> -Alex
> > > >>
> > > >> On 4/17/20, 3:20 PM, "Greg Dove" <greg.d...@gmail.com> wrote:
> > > >>
> > > >> I am not sure whether the current work on 0.9.7 release is
> a dry
> > run
> > > >> or a
> > > >> full effort (I have not been reading all details recently,
> > sorry). I
> > > >> assume
> > > >> it is a full release effort.
> > > >>
> > > >> For 0.9.6 release we had a collective rush to add things to
> > RELEASE
> > > >> NOTES
> > > >> before release.
> > > >>
> > > >> I have a few things I want to add to RELEASE NOTES. But I
> would
> > also
> > > >> like
> > > >> to make sure I apply our collective learning from last
time.
> > > >>
> > > >> The issue last time (iirc) was that we pushed updates into
> develop
> > > >> branch
> > > >> which I think then were being cherry picked into release
> branch.
> > > This
> > > >> I
> > > >> believe contributed to some merge conflicts at some point.
> > > >> Can I get a definitive answer for where I should add
> updates to
> > > >> RELEASE
> > > >> NOTES at this point if it is not too late? I think it is
> probably
> > > >> supposed
> > > >> to be directly into release branch which then gets merged
> later
> > back
> > > >> into
> > > >> develop, but I'd like a confirmation of that if it is
> correct (and
> > > >> not too
> > > >> late), please.
> > > >>
> > > >>
> > > >>
> > >
> >
> >
> > --
> > Carlos Rovira
> >
>
https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fabout.me%2Fcarlosrovira&data=02%7C01%7Caharui%40adobe.com%7C8c0bbd636f1948da818f08d7e55f7033%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637230070384701851&sdata=FYY6G70QWCEoixf8Hb%2BJ86X2yiEa84Ytk1ST8GQSknk%3D&reserved=0
> >
>
>
>
