Re: Best practice to bump consumers portrevision on quarterly

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.