Hi Pedro, Am 01.05.24 um 15:39 schrieb Pedro Lino:
Hi MatthiasOn 05/01/2024 1:30 PM WEST Matthias Seidel <matthias.sei...@hamburg.de> wrote:Maybe it is easier to delete the current 42x branch and start a new 42X branch? If any patches were added to 42X only (and they are still relevant), then these should be cherry picked to trunk before splitting...+1. The AOO42X branch is quite old. Development only really happens on trunk. The best maintained branch is trunk, and any branches should be as close to trunk as possible.Trunk is an unstable branch.That is the nature of Trunk ;)Everything we want to have in AOO42X (which was branched from trunk some years ago) should have been cherry-picked early.Do you mean that all patches/fixes in 42X are in Trunk also?
Trunk has all patches, AOO42X only those that were cherry-picked from trunk.
Therefore there would not be a problem in deleting the current branch 42X and start a new one? This would make sense because Damjan mentioned that many relevant fixes in trunk are not included in 42X
If he didn't cherry-pick them (for a reason?) they are not included.
Also why is the next release 4.2.x? Haven't we made enough changes for 5.0.x? If not, what should be in 5.0.x?It is quite hypothetical to discuss about versions we are NOT capable to release.It is. But Damjan's question is still valid? What would be the change needed to consider this 5.0? I would say that having a Winx64 would be such a condition. As it is, I still see this as 42X
For AOO 5.0 I would expect at least that we support ODF 1.3. A Win64 build would be great for AOO 4.5.0.But again, we are not able to do a release, we should work on that problem first.
The next version we CAN release is 4.1.16 (AOO41X).That is true!If we become able to do a release for a newer branch (AOO42X), we should simply release what we have...Exactly, but including all valid updates that have been added to trunk but not cherry picked to 42X
If they were not cherry-picked I would expect there was a reason for it? Regards, Matthias
Best, Pedro --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
smime.p7s
Description: Kryptografische S/MIME-Signatur
