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 <ma...@apache.org> wrote:

> 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
>
> It looks like 1.4 development proceeded on master after the b1_4 tag and
> then master switched to 2.0 after the 1.4 tag.
>
> There is also a b2_0 branch that was created and abandoned.
>
> My proposal for a way forward as follows:
>
> - 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
>
> Thoughts?
>
> Mark
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
> For additional commands, e-mail: dev-h...@commons.apache.org
>
>

Reply via email to