Re: [Tiki-devel] New Tiki branch 26.x
Jonny Bradley via TikiWiki-devel <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi Victor Thanks, no, yours are all fine of course, present in both branches as expected. I think the decision in the end was to mostly keep to "commit in master, then cherrypick to 26.x" but if it makes sense, commit and push to 26.x first and cherrypick to master when it's proved working (for when you need to test on client data for instance). I'll also do a compare occasionally to make sure we don't miss anything important (as can others, please feel free ;) Thanks jonny > On 21 Jun 2023, at 12:33, Victor Emanouilov via TikiWiki-devel <[email protected]> wrote: > > Hi Jonny, > > I've merged a few FIX merge requests to 26.x branch and manually cherry-picked the commits to master. Did we agree to use another procedure here? > > I see a couple of commits to master not in 26.x but not the vice-verse. I am pretty sure we will miss some commits from 26.x in master if we merge into 26.x until release, so a final merge will be a good idea. > > Regards, > Victor > > On 6/21/23 10:57 AM, Jonny Bradley via TikiWiki-devel wrote: >> Hi all >> >> I already see commits in 26.x that are not also in master, and FIXes in master that should be in 26.x, but are not - maybe we need to improve the docs? >> >> jonny >> >> >> >>> On 20 Jun 2023, at 13:15, Jonny Bradley via TikiWiki-devel <[email protected]> wrote: >>> >>> Many thanks Roberto and Rodriguez, great job! >>> >>> I like the look and sound of Alnilam as it's a real star and is the one in the middle of Orion's belt, so we've all seen it! >>> >>> http://stars.astro.illinois.edu/sow/alnilam.html >>> >>> And it's going at 26km/s... a little surprised we haven't had it before in fact. >>> >>> Just my 2¢ :p >>> >>> jb >>> >>> >>> >>>> On 20 Jun 2023, at 11:40, Roberto Kirschbaum <[email protected]> wrote: >>>> >>>> Dear Devs, >>>> >>>> Rodriguez and I have branched Tiki 26.x. Here are a few useful links: >>>> * https://dev.tiki.org/Backport%20guidelines >>>> * https://dev.tiki.org/Where-to-commit >>>> >>>> We haven't chosen a star name yet for this version. Geoff has contributed with these suggestions, will you please vote? >>>> >>>> Here are some other suggested star names or clusters (are they allowed???) that have ‘26’ associated with them in some (very obscure!) way: >>>> • Westerlund 1 used to be called Westerlund 1-26 (see https://esahubble.org/images/potw1710a/) >>>> • Pismis 26 (see https://www.nasa.gov/image-feature/goddard/2022/hubble-glimpses-a-glittering-gathering-of-stars) >>>> • Messier 26 (see https://www.constellation-guide.com/constellation-list/scutum-constellation/) >>>> • Alnilam or Epsilon Ori – only because both its radial line of sight velocity and its true speed relative to the Sun is 26 km/s !! (see http://stars.astro.illinois.edu/sow/bright.html) >>>> • 26 Draconis (see https://theskylive.com/sky/stars/26-draconis-star) >>>> >>>> >>>> Thanks >>>> Roberto >>>> _______________________________________________ >>>> TikiWiki-devel mailing list >>>> [email protected] >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >>> >>> >>> _______________________________________________ >>> TikiWiki-devel mailing list >>> [email protected] >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >> >> >> _______________________________________________ >> TikiWiki-devel mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > > > _______________________________________________ > TikiWiki-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel _______________________________________________ TikiWiki-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel