From nobody Mon Nov 27 12:55:16 2023 X-Original-To: freebsd-ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sf5D11JHtz52MyL for ; Mon, 27 Nov 2023 12:55:29 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sf5D06ZnFz4ZqL; Mon, 27 Nov 2023 12:55:28 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701089728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oG1K7cX6VvwbIPITDFsrjnbcHB5B6MCQk+9ZxpfXiRs=; b=PgI3v58R6HK9gNR897vxqrWJlaRaSdoKR9y05Q7wLTm3NYDkL6XfcJrHoCXxusTQrd7hMf DTBRqyuzpYEHbs0fa28IOQeMo875dhEyQz2T/5JYwBvFXqGMkzQtAp6RRwbV3d5ALSU+jX VcBD6xG6IRbFNbpUX0ZAjF5DMgeXBbrFXF6J3iFoGdziTN/H9am1qXwALzQp3hOdjjEyxf pYEvvnhq5juXaIdRYdKVa+aymqpX/O0gQvU48m1epB99oCdZI2Nnt0AlFYWOh/e98Ri45d bUk8eGXlAjLl4SdTbrptTMg5OD9s+Tv5/BD2roqOfSYI5ixGjZ9k65p3zq43jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701089728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oG1K7cX6VvwbIPITDFsrjnbcHB5B6MCQk+9ZxpfXiRs=; b=HQkmLIBYMQwgs0Jjoq6DdOZHscDpad+LKbo7ZkYCk/QPnjbSwuSG3N/s2awGc2l8a/JtR4 /hWEW7L2Q5e37/2/dFdjJWnyeBDqL0sk4c+J5R5mlSyDyMgSljViBFE0Gh1C3FxcTuDbF5 XaT1uNLDl+COvldblSzLWwcF9Z7iUop9hKdt+SQZp63cayhL14iJ6z43/mf1RKyImqO+dA maEX+z341NN+dsFHF7Ccrw5rCtY2lUMroFY+w2l1fQfkphg3q9UZlLsIcSPSS9z6Eo1pdV KbAFT9XRcB5IHqw+JIWYQCm71SGF/7LW3K1IICZLhXBmq6+6OV7gUtZOdCQPHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701089728; a=rsa-sha256; cv=none; b=UQZjWlTAImE03iPb8V2qKO9xPq3SkkkwyrdkeR+YP90lrllGCSICijoQ3FTj+Rix5Baos3 tzgVGaeAnBfAyH3zzKgJT1Pg2pfyWJpwi35bNm7LkrU+fIsSblUh0mCOQ7iuZzjFwTUS17 WW9/OQc98QM7bf1exoCFP+Cvpo0G7cVlOwdxUx/0rlcbObBU6X1OR0sT7AIF8JvFIqbpQK ZualtvSCvs5h6CPSVTFGHHNAF4GRSobR93rRwtvJxJ5PnnhF6VHi4uM5V88O/D3nxSASBZ g6r9gttQO1ML1Iy8yur7KZqNWkEX9vW5OVOm6xIdPKR3LZZsV5mCDe6W267z+A== Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sf5D05TQWzt0g; Mon, 27 Nov 2023 12:55:28 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3b52360cdf0so1903269b6e.2; Mon, 27 Nov 2023 04:55:28 -0800 (PST) X-Gm-Message-State: AOJu0Yyry/z0sTh9cipuHYkJSlJw4gu4nxOKqtVl0ouiPRuHgHi8u8z5 2g0R56Z8y/6yeKXAaEljA4A4aUel6J8CnSYTJ2g= X-Google-Smtp-Source: AGHT+IESNKguT+o4hgVqO1EqG2fjJUnCQ/zcVA325JbJKggwtv7vziXo3DnXo2ele3f6iRca5eMncylk6sB4m3SlL68= X-Received: by 2002:a05:6358:60c9:b0:16d:bd2f:a832 with SMTP id i9-20020a05635860c900b0016dbd2fa832mr6203065rwi.17.1701089727737; Mon, 27 Nov 2023 04:55:27 -0800 (PST) List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Nuno Teixeira Date: Mon, 27 Nov 2023 12:55:16 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Best practice to bump consumers portrevision on quarterly To: Jan Beich Cc: FreeBSD Mailing List Content-Type: multipart/alternative; boundary="000000000000f3f2dc060b21d0dd" --000000000000f3f2dc060b21d0dd Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 ##### Jan Beich escreveu no dia domingo, 26/11/2023 =C3=A0(s= ) 20:29: > Nuno Teixeira 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 $ 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_wh= en_mfcing > "Clearly mark direct commits ..." but ports/ tree is a probably > more sloppy upholding this. > --=20 Nuno Teixeira FreeBSD Committer (ports) --000000000000f3f2dc060b21d0dd Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Jan,

I'm waiting o= n 9b214a66ea8788a6da299139decf506a4b4f5ff1 commit to be MFHed so I can proc= eed with wxgtk32.

$ git cherry-pick -x 03eac77= c103b637b316d6a73df7cae01986402cf (bump consumers commit)
$ git checkout= @ .
$ xargs -n1 portedit bump-revision -i </path/to/port.list (my co= nsumers.list)
$ git add -u
$ git cherry-pick --continue
I'm getting this result after `cherry-pick --continue`:

#####
*/*: Bump consumers of x11-toolki= ts/wxgtk32

New version of wxWidgets in tree

(cherry picked fr= om commit 03eac77c103b637b316d6a73df7cae01986402cf)

# Conflicts:
= # =C2=A0 =C2=A0 =C2=A0 databases/grass8/Makefile
# =C2=A0 =C2=A0 =C2=A0 = games/0ad/Makefile
# =C2=A0 =C2=A0 =C2=A0 graphics/hugin/Makefile
# = =C2=A0 =C2=A0 =C2=A0 lang/erlang-runtime24/Makefile
# =C2=A0 =C2=A0 =C2= =A0 lang/erlang-runtime25/Makefile
# =C2=A0 =C2=A0 =C2=A0 lang/erlang-ru= ntime26/Makefile
# =C2=A0 =C2=A0 =C2=A0 lang/erlang-wx/Makefile
# =C2= =A0 =C2=A0 =C2=A0 math/saga/Makefile
# =C2=A0 =C2=A0 =C2=A0 security/ver= acrypt/Makefile
#
# It looks like you may be committing a cherry-pick= .
# If this is not correct, please run
# =C2=A0 =C2=A0 =C2=A0 git upd= ate-ref -d CHERRY_PICK_HEAD
# and try again.


# Please enter t= he commit message for your changes. Lines starting
# with '#' wi= ll be ignored, and an empty message aborts the commit.
#
# Date: =C2= =A0 =C2=A0 =C2=A0Thu Nov 23 11:20:28 2023 +0000
#
# On branch 2023Q4<= br># Your branch is up to date with 'origin/2023Q4'.
#
# You = are currently cherry-picking commit 03eac77c103b.
#
# Changes to be c= ommitted:
# =C2=A0 =C2=A0 =C2=A0 modified: =C2=A0 astro/opencpn/Makefile=
# =C2=A0 =C2=A0 =C2=A0 modified: =C2=A0 astro/phd2/Makefile
# =C2=A0= =C2=A0 =C2=A0 modified: =C2=A0 audio/audacity/Makefile
# =C2=A0 =C2=A0 = =C2=A0 modified: =C2=A0 audio/spek/Makefile
# =C2=A0 =C2=A0 =C2=A0 modif= ied: =C2=A0 cad/PrusaSlicer/Makefile
<snip>
= #####

Jan Beich <jbeich= @freebsd.org> escreveu no dia domingo, 26/11/2023 =C3=A0(s) 20:29:
Nuno Teixeira <= ;eduardo@freebsd.o= rg> 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.

=C2=A0 $ git cherry-pick -x
=C2=A0 $ git checkout @ .
=C2=A0 $ xargs -n1 portedit bump-revision -i </path/to/port.list
=C2=A0 $ git add -u
=C2=A0 $ 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.f= reebsd.org/en/articles/committers-guide/#_considerations_when_mfcing =C2=A0 =C2=A0 "Clearly mark direct commits ..."=C2=A0 but ports/ = tree is a probably
=C2=A0 =C2=A0 more sloppy upholding this.


--
Nuno Teixeira
FreeBSD Committ= er (ports)
--000000000000f3f2dc060b21d0dd--