Hi Chris, Making a local no-commit merge on and looked at your explanation I don’t see the issue. There would be a conflict which needs to be resolved to include the develop contents. I was worried that release poms would add the wrong version to develop automatically, but from what I see that wouldn’t happen without a conflict.
What am I missing? Thanks. From: Christofer Dutz<mailto:[email protected]> Sent: Wednesday, May 13, 2020 12:29 PM To: [email protected]<mailto:[email protected]> Subject: Re: [DISCUSS] Discuss Release Apache Royale 0.9.7 Hi Yishay, Exactly ... perhaps a little explanation on what would usually happen: develop is on 1.2.0-SNAPSHOT When creating the release branch we have this: develop is on 1.3.0-SNAPSHOT rel/1.2 is on 1.2.0-SNAPSHOT Now on "release cutting day" after cutting the release: develop is on 1.3.0-SNAPSHOT rel/1.2 is on 1.2.1-SNAPSHOT As the change to 1.2.1-SNAPSHOT is newer than the 1.3.0-SNAPSHOT change, when you merge the release branch back to develop you would make this develop 1.2.1-SNAPSHOT Hope that explains ... in this case it probably wouldn't matter as both rel as develop are on the same version (which is not ideal) Chris Am 13.05.20, 11:21 schrieb "Yishay Weiss" <[email protected]>: So in other words, you’re suggesting to cherry-pick the fixes in release, rather than merging? I think that makes sense. Piotr, do you remember what your strategy was for 0.9.6? From: Christofer Dutz<mailto:[email protected]> Sent: Wednesday, May 13, 2020 12:13 PM To: [email protected]<mailto:[email protected]> Subject: Re: [DISCUSS] Discuss Release Apache Royale 0.9.7 Hi Yisahy, I don’t think you should merge the release branch into dev … this will mess up the versions of all modules quite a bit (Even if in this case it might probably not matter) but as soon as the 1.0.0 is out it will. For most projects it’s the usual thing to merge the release tag (not the branch) to master and leave the release branch open for future bugfix releases without merging back to develop. Chris Von: Yishay Weiss <[email protected]> Antworten an: "[email protected]" <[email protected]> Datum: Mittwoch, 13. Mai 2020 um 10:01 An: "[email protected]" <[email protected]> Betreff: RE: [DISCUSS] Discuss Release Apache Royale 0.9.7 I’ve hit ‘release’ on Nexus and committed 0.9.7 to dist on svn. I suppose I should also merge release into dev. Do steps 46-106 [1] need to be performed manually? [1] https://github.com/apache/royale-asjs/wiki/Task-List-For-Royale-Releases From: Carlos Rovira <[email protected]> Sent: Wednesday, May 13, 2020 10:14:27 AM To: Apache Royale Development <[email protected]> Subject: Re: [DISCUSS] Discuss Release Apache Royale 0.9.7 Hi Yishay yes, please go ahead and announce. thanks! :) El mié., 13 may. 2020 a las 8:32, Yishay Weiss (<[email protected]>) escribió: > Carlos, I’d like to announce the vote. Does yours still stand? > > ________________________________ > From: Carlos Rovira <[email protected]> > Sent: Wednesday, May 13, 2020 8:58:19 AM > To: Apache Royale Development <[email protected]> > Subject: Re: [DISCUSS] Discuss Release Apache Royale 0.9.7 > > Hi Harbs, > > about OpenSans, don't think it was introduced by me. I can see it in > MXRoyale, ASDoc and TourDeFlex examples, so maybe was Alex? really don't > know. TDJ uses Lato Font instead. > > I added both to NOTICE file > > Thanks > > > > > > > El mié., 13 may. 2020 a las 7:28, Carlos Rovira (<[email protected] > >) > escribió: > > > Hi Harbs, > > > > we have Maven Wrapper in all our repos (mvnw). From the source: > > > > "The Maven Wrapper is an easy way to ensure a user of your Maven build > > has everything necessary to run your Maven build." > > > > [1] https://github.com/takari/maven-wrapper > > > > El mar., 12 may. 2020 a las 19:26, Harbs (<[email protected]>) > > escribió: > > > >> And now I just discovered I never installed Maven on this machine… :-( > >> > >> Oy! > >> > >> > On May 12, 2020, at 8:09 PM, Harbs <[email protected]> wrote: > >> > > >> > and I got past that point... > >> > >> > > > > -- > > Carlos Rovira > > http://about.me/carlosrovira > > > > > > -- > Carlos Rovira > http://about.me/carlosrovira > -- Carlos Rovira http://about.me/carlosrovira From: Carlos Rovira<mailto:[email protected]> Sent: Wednesday, May 13, 2020 10:14 AM To: Apache Royale Development<mailto:[email protected]> Subject: Re: [DISCUSS] Discuss Release Apache Royale 0.9.7 Hi Yishay yes, please go ahead and announce. thanks! :) El mié., 13 may. 2020 a las 8:32, Yishay Weiss (<[email protected]>) escribió: > Carlos, I’d like to announce the vote. Does yours still stand? > > ________________________________ > From: Carlos Rovira <[email protected]> > Sent: Wednesday, May 13, 2020 8:58:19 AM > To: Apache Royale Development <[email protected]> > Subject: Re: [DISCUSS] Discuss Release Apache Royale 0.9.7 > > Hi Harbs, > > about OpenSans, don't think it was introduced by me. I can see it in > MXRoyale, ASDoc and TourDeFlex examples, so maybe was Alex? really don't > know. TDJ uses Lato Font instead. > > I added both to NOTICE file > > Thanks > > > > > > > El mié., 13 may. 2020 a las 7:28, Carlos Rovira (<[email protected] > >) > escribió: > > > Hi Harbs, > > > > we have Maven Wrapper in all our repos (mvnw). From the source: > > > > "The Maven Wrapper is an easy way to ensure a user of your Maven build > > has everything necessary to run your Maven build." > > > > [1] https://github.com/takari/maven-wrapper > > > > El mar., 12 may. 2020 a las 19:26, Harbs (<[email protected]>) > > escribió: > > > >> And now I just discovered I never installed Maven on this machine… :-( > >> > >> Oy! > >> > >> > On May 12, 2020, at 8:09 PM, Harbs <[email protected]> wrote: > >> > > >> > and I got past that point... > >> > >> > > > > -- > > Carlos Rovira > > http://about.me/carlosrovira > > > > > > -- > Carlos Rovira > http://about.me/carlosrovira > -- Carlos Rovira http://about.me/carlosrovira
