Re: [FILEUPLOAD] State of the 1.6 branch

2023-01-03 Thread Mark Thomas
On 03/01/2023 09:52, Mark Thomas wrote: On 15/12/2022 18:54, Jochen Wiedmann wrote: On Wed, Dec 14, 2022 at 12:20 PM Mark Thomas wrote: - Delete the b2_0 branch - Move the head of the b1_4 branch to the 1.4 tag - Update the b1_4 branch for development of 1.4.1     (or should that be 1.5 and s

Re: [FILEUPLOAD] State of the 1.6 branch

2023-01-03 Thread Mark Thomas
On 15/12/2022 18:54, Jochen Wiedmann wrote: On Wed, Dec 14, 2022 at 12:20 PM Mark Thomas wrote: - Delete the b2_0 branch - Move the head of the b1_4 branch to the 1.4 tag - Update the b1_4 branch for development of 1.4.1 (or should that be 1.5 and start a new branch?) - Back-port my recent

Re: [FILEUPLOAD] State of the 1.6 branch

2022-12-15 Thread Jochen Wiedmann
On Wed, Dec 14, 2022 at 12:20 PM Mark Thomas wrote: > - Delete the b2_0 branch > - Move the head of the b1_4 branch to the 1.4 tag > - Update the b1_4 branch for development of 1.4.1 >(or should that be 1.5 and start a new branch?) > - Back-port my recent file count limit change If you can d

Re: [FILEUPLOAD] State of the 1.6 branch

2022-12-15 Thread Gilles Sadowski
Hi. Le jeu. 15 déc. 2022 à 17:36, Mark Thomas a écrit : > > On 14/12/2022 12:12, Gilles Sadowski wrote: > > Hi. > > > > Le mer. 14 déc. 2022 à 12:25, Gary Gregory a écrit > > : > >> > >> I would create a branch called "1.x" instead and bump the version in the > >> POM to 1.5.0. > >> > >> FYI, I

Re: [FILEUPLOAD] State of the 1.6 branch

2022-12-15 Thread Gary Gregory
FYI, for all the components I've been working on, I have used the x.y.z format. Gary On Thu, Dec 15, 2022, 11:36 Mark Thomas wrote: > On 14/12/2022 12:12, Gilles Sadowski wrote: > > Hi. > > > > Le mer. 14 déc. 2022 à 12:25, Gary Gregory a > écrit : > >> > >> I would create a branch called "1.x

Re: [FILEUPLOAD] State of the 1.6 branch

2022-12-15 Thread Mark Thomas
On 14/12/2022 12:12, Gilles Sadowski wrote: Hi. Le mer. 14 déc. 2022 à 12:25, Gary Gregory a écrit : I would create a branch called "1.x" instead and bump the version in the POM to 1.5.0. FYI, I've been using the x.y.z version format in most of not all components I work on, I find that it se

Re: [FILEUPLOAD] State of the 1.6 branch

2022-12-14 Thread Gilles Sadowski
Hi. Le mer. 14 déc. 2022 à 12:25, Gary Gregory a écrit : > > I would create a branch called "1.x" instead and bump the version in the > POM to 1.5.0. > > FYI, I've been using the x.y.z version format in most of not all components > I work on, I find that it sets expectations better, for me anyway

Re: [FILEUPLOAD] State of the 1.6 branch

2022-12-14 Thread Gary Gregory
I would create a branch called "1.x" instead and bump the version in the POM to 1.5.0. FYI, I've been using the x.y.z version format in most of not all components I work on, I find that it sets expectations better, for me anyway. Gary On Wed, Dec 14, 2022, 06:20 Mark Thomas wrote: > Hi all, >

[FILEUPLOAD] State of the 1.6 branch

2022-12-14 Thread Mark Thomas
Hi all, I was looking into the possibility of back-porting my recent file count limit change to 1.4 and I think the Github branch is rather out of sync. Using gitk to explore the history, the last commit on the b1_4 branch was eed3e5 on 2017-06-03 But the 1.4 tag is at 047f315 on 2018-12-28