Re: Release branch added to git

2022-11-23 Thread Gavin Smith
On Wed, Nov 23, 2022 at 11:02:08AM +0100, Robert Pluim wrote: > > On Sat, 12 Nov 2022 22:26:54 +, Gavin Smith > > said: > > Gavin> I have updated the version number on the release branch to 7.0.1 > already, > Gavin> so it should be ready to go at the time we decide to make a

Re: Release branch added to git

2022-11-23 Thread Robert Pluim
> On Sat, 12 Nov 2022 22:26:54 +, Gavin Smith > said: Gavin> I have updated the version number on the release branch to 7.0.1 already, Gavin> so it should be ready to go at the time we decide to make a new release Gavin> from this branch. Iʼd suggest you not do that un

Re: Release branch added to git

2022-11-12 Thread Patrice Dumas
On Sat, Nov 12, 2022 at 11:25:04PM +, Gavin Smith wrote: > > I can do that change/commit on the 7.0 branch. > > OK that's fine. You can either do > > git cherry-pick b238da561dad6 > > and then to remove parts of the commit, do > > git reset --soft HEAD^ > > followed by > > git reset . >

Re: Release branch added to git

2022-11-12 Thread Gavin Smith
On Sun, Nov 13, 2022 at 12:15:19AM +0100, Patrice Dumas wrote: > On Sat, Nov 12, 2022 at 10:26:54PM +, Gavin Smith wrote: > > While other changes since the last release may be valuable, I don't see > > that they are urgent. Please discuss it if there's anything vital that > > people think that

Re: Release branch added to git

2022-11-12 Thread Patrice Dumas
On Sat, Nov 12, 2022 at 10:26:54PM +, Gavin Smith wrote: > While other changes since the last release may be valuable, I don't see > that they are urgent. Please discuss it if there's anything vital that > people think that should be included. > I think that the following change should be in

Re: Release branch added to git

2022-11-12 Thread Raymond Toy
On Sat, Nov 12, 2022 at 2:56 PM Gavin Smith wrote: > On Sat, Nov 12, 2022 at 02:30:11PM -0800, Raymond Toy wrote: > > On Sat, Nov 12, 2022 at 2:27 PM Gavin Smith > > wrote: > > > > > On Tue, Nov 08, 2022 at 07:55:44PM +, Gavin Smith wrote: > > > > > No, you just cut a new release branch. Th

Re: Release branch added to git

2022-11-12 Thread Patrice Dumas
On Sat, Nov 12, 2022 at 11:53:19PM +0100, Patrice Dumas wrote: > On Sat, Nov 12, 2022 at 10:26:54PM +, Gavin Smith wrote: > > > > Commit 15ef3457ed1 (on release branch) > > > > This led to test result changes in > > tp/t/results/sectioning/unnumbered_before_top_node.pl > > tp/t/results/prefor

Re: Release branch added to git

2022-11-12 Thread Gavin Smith
On Sat, Nov 12, 2022 at 11:53:19PM +0100, Patrice Dumas wrote: > It looks like a bug, > @@ -9916,6 +9927,7 @@ sub output($$) >if (!$fulltitle and $self->{'global_commands'}->{'titlefont'} >and $self->{'global_commands'}->{'titlefont'}->[0]->{'args'} >and > defined($self->{'glo

Re: Release branch added to git

2022-11-12 Thread Gavin Smith
On Sat, Nov 12, 2022 at 02:30:11PM -0800, Raymond Toy wrote: > On Sat, Nov 12, 2022 at 2:27 PM Gavin Smith > wrote: > > > On Tue, Nov 08, 2022 at 07:55:44PM +, Gavin Smith wrote: > > > > No, you just cut a new release branch. The release branch is only for > > > > a certain release or a seri

Re: Release branch added to git

2022-11-12 Thread Patrice Dumas
On Sat, Nov 12, 2022 at 10:26:54PM +, Gavin Smith wrote: > > Commit 15ef3457ed1 (on release branch) > > This led to test result changes in > tp/t/results/sectioning/unnumbered_before_top_node.pl > tp/t/results/preformatted/titlefont_in_example.pl > > which weren't on the master branch - in b

Re: Release branch added to git

2022-11-12 Thread Raymond Toy
On Sat, Nov 12, 2022 at 2:27 PM Gavin Smith wrote: > On Tue, Nov 08, 2022 at 07:55:44PM +, Gavin Smith wrote: > > > No, you just cut a new release branch. The release branch is only for > > > a certain release or a series of releases, depending on the > > > development strategy. Basically,

Release branch added to git

2022-11-12 Thread Gavin Smith
On Tue, Nov 08, 2022 at 07:55:44PM +, Gavin Smith wrote: > > No, you just cut a new release branch. The release branch is only for > > a certain release or a series of releases, depending on the > > development strategy. Basically, as long as you expect the next > > release to be a bugfix rel