I think we are both right, in a way. The fact is that trunk and AOO42X _have_ diverged, and doing straight cherry-picks from trunk to AOO42X may, or may not, work.
Naming aside, I think that we should at least try to get AOO-ng out. > On Jun 8, 2026, at 9:58 AM, Pedro Lino via dev <[email protected]> > wrote: > > Hi Jim > > I am pretty sure that it is the other way around. Newer fixes are always > added to trunk and cherry picked to 42X (and/or 41X) > > jbampton has been committing changes to trunk (as you can see in the dev > mailing list) so these are the newer changes. > > I think the easiest path is to rename 42x to 42Xold and branch trunk to a new > 42X > > I am pretty sure there isn't any feature/function that was added directly to > 42X (but unfortunately Matthias isn't here to confirm) so there should be no > code loss. > > Best, > Pedro > >> On 06/08/2026 1:17 PM WEST Jim Jagielski <[email protected]> wrote: >> >> >> Over the last month while working on the various Python and Aarm64 stuff, it >> made me really, really aware of just how divergent the AOO42X and trunk >> branches have become. A lot, and I mean a LOT, is just whitespace changes, >> but that causes any really analysis regarding the differences between the 2 >> to be loaded with a lot of noise. >> >> So what to do...? >> >> Option 1: >> Branch off the new trunk off of AOO42x and then backport functional changes >> of the old trunk to new trunk? Keep old trunk as 'old-trunk' >> >> Option 2: >> Backport all the whitespace differences to AOO42X, even if they collide or >> reverse the more "correct" fixes in AOO42X. >> >> My preference would be Option 1, since I think it _might_ be easier and, I >> think, the whitespace changes in AOO42X are the more correct and the more >> recent. >> >> Thoughts? >> -- >> Jim >> "This is an outrage!" >> Tony Harrison > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > -- Jim "This is an outrage!" Tony Harrison
