Re: Best practice to bump consumers portrevision on quarterly

Hello Jan,

I'm waiting on 9b214a66ea8788a6da299139decf506a4b4f5ff1 commit to be MFHed
so I can proceed with wxgtk32.

$ git cherry-pick -x 03eac77c103b637b316d6a73df7cae01986402cf (bump
consumers commit)
$ git checkout @ .
$ xargs -n1 portedit bump-revision -i </path/to/port.list (my
consumers.list)
$ git add -u
$ git cherry-pick --continue

I'm getting this result after `cherry-pick --continue`:

#####
*/*: Bump consumers of x11-toolkits/wxgtk32

New version of wxWidgets in tree

(cherry picked from commit 03eac77c103b637b316d6a73df7cae01986402cf)

# Conflicts:
#       databases/grass8/Makefile
#       games/0ad/Makefile
#       graphics/hugin/Makefile
#       lang/erlang-runtime24/Makefile
#       lang/erlang-runtime25/Makefile
#       lang/erlang-runtime26/Makefile
#       lang/erlang-wx/Makefile
#       math/saga/Makefile
#       security/veracrypt/Makefile
#
# It looks like you may be committing a cherry-pick.
# If this is not correct, please run
#       git update-ref -d CHERRY_PICK_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Thu Nov 23 11:20:28 2023 +0000
#
# On branch 2023Q4
# Your branch is up to date with 'origin/2023Q4'.
#
# You are currently cherry-picking commit 03eac77c103b.
#
# Changes to be committed:
#       modified:   astro/opencpn/Makefile
#       modified:   astro/phd2/Makefile
#       modified:   audio/audacity/Makefile
#       modified:   audio/spek/Makefile
#       modified:   cad/PrusaSlicer/Makefile
<snip>
#####

Jan Beich <jbeich@freebsd.org> escreveu no dia domingo, 26/11/2023 à(s)
20:29:

> Nuno Teixeira <eduardo@freebsd.org> writes:
>
> > Hello,
> >
> > What is the correct way of bumping consumers in quarterly?
> >
> > 1. cherry-pick port update
> > 2. bump portrevision consumers on quarterly directly?
>
> Cherry-pick both. To overcome merge conflicts reset index and bump
> directly. The important part is to retain the commit message with
> cherry-pick annotation.
>
>   $ git cherry-pick -x
>   $ git checkout @ .
>   $ xargs -n1 portedit bump-revision -i </path/to/port.list
>   $ git add -u
>   $ git cherry-pick --continue
>
> Direct commits are intended mainly when branches diverge too much.
> Ideally, those should be also annotated[1] with rationale why cherry-pick
> wasn't considered (PITA enough to discourage direct commits).
>
> [1]
> https://docs.freebsd.org/en/articles/committers-guide/#_considerations_when_mfcing
>     "Clearly mark direct commits ..."  but ports/ tree is a probably
>     more sloppy upholding this.
>


-- 
Nuno Teixeira
FreeBSD Committer (ports)