Re: Release branch added to git

[Gavin Smith]

On Sun, Nov 13, 2022 at 12:15:19AM +0100, Patrice Dumas wrote:
> On Sat, Nov 12, 2022 at 10:26:54PM +0000, 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 included:
> 
> diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
> index 8dee8df..5db18e7 100644
> --- a/tp/Texinfo/Common.pm
> +++ b/tp/Texinfo/Common.pm
> @@ -767,7 +767,7 @@ foreach my $command (
>  
>  
>  our %preamble_commands;
> -foreach my $preamble_command ('direnty', 'hyphenation', 'errormsg',
> +foreach my $preamble_command ('direntry', 'hyphenation', 'errormsg',
>         'inlineraw', '*', keys(%document_settable_at_commands),
>         (grep {$Texinfo::Commands::block_commands{$_} eq 'format_raw'
>                or $Texinfo::Commands::block_commands{$_} eq 'region'}
> 
> It is part of
> https://git.savannah.gnu.org/cgit/texinfo.git/commit/?id=b238da561dad6ab693eb372f29b999f4d93f67d1
> but the remaining of the commit is not important.
> 
> The tests need to be regenerate afterwards.
> 
> 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 .
git checkout --patch
git add -u

etc., or if you prefer you can start the commit from scratch.  I'm
not sure if it makes a difference either way - it tells you when
you are committing that you are cherry-picking, but I can't see that
this is recorded anywhere afterwards.