Almost: Trunk | | |----> New branch for 4.2.x | | | |---> Branch and/or Tag for 4.2.0 | | | |---> Branch and/or Tag for 4.2.1
etc That is, 4.2.2, for example, is not branched from 4.2.1 but rather from the ever existing 4.2.x branch. Alternatively, all 4.2.x releases are branches off of the 42X branch, instead of 4.2.1 being a branch of 4.2.0, and 4.2.2 being a branch of 4.2.1 and 4.2.3 being a branch of 4.2.2, etc... This allows a nice mix of CTR and RTC processes > On Jan 9, 2019, at 3:07 PM, Marcus <marcus.m...@wtnet.de> wrote: > > Am 09.01.19 um 16:12 schrieb Jim Jagielski: >> Let me go into more detail here :) >> So my plan is to create a 42X branch off of trunk once trunk builds. This >> branch will now be the development branch for the 4.2.x releases, at which >> point trunk will be the future development tree (and all gbuild related >> reversions required for the 4.2.x branch will be re-applied). So the process >> will be development on trunk w/ back ports to 42X. 4.2.0, 4.2.1, et.al. >> releases will be branched and tagged from the 42X branch. >> Sound OK? > > seems so. When I understood this correct, then the following graphical > explaination should support this. So, let me try: > > > > Trunk > | > |---> New branch for 4.2.0 > | | > | |---> New branch for 4.2.1 > | | > | |---> New branch for 4.2.2 > | | > | |---> ... > | > |---> New branch for 4.3.0 > | | > | |---> New branch for 4.3.1 > | | > | |---> New branch for 4.3.2 > | | > | |---> ... > . > . > . > |---> New branch for 5.0.0 > | | > | |---> ... > \/ > > > > Ciao > > Marcus > > > >>> On Jan 9, 2019, at 10:02 AM, Jim Jagielski <j...@jagunet.com> wrote: >>> >>> In another thread I mentioned a plan... Bringing it up here for a wider >>> audience. >>> >>> My plan is to branch a 4.20 branch off of trunk as soon as it is relatively >>> buildable on macOS. > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org > For additional commands, e-mail: dev-h...@openoffice.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
