Hi Jim, I answer quickly ...
Am 8. Juni 2026 14:17:21 MESZ schrieb Jim Jagielski <[email protected]>: >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...? The branches trunk and AOO2XX are not equal. Not everything has been added to the release branch, in order to avoid unnecessary delays. The idea was fix the regressions and then get the 4.2.0 out. But since everyone works on something different, more pressing changes, more interesting changes, the 4.2.x branch stalled. What are you comparing the 2 branches for? > >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]
