From nobody Thu Dec 7 15:33:30 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 4SmJFx6XGPz539GS for ; Thu, 7 Dec 2023 15:33:41 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4SmJFx63wyz4NLp; Thu, 7 Dec 2023 15:33:41 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701963221; 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=3tNraAyJfrJ2UtQ6cPNKwliGSMErHJmqAK+rVy3dHbA=; b=LpuFcll7uYCefDoUPV4ny8EVX+tO8iicbIE8+3wlbrSk3Kq6zH4boLDFkvZTPsumDMGxOp PenENoZr4pcoixkniTF3YeNBjkc+BZ9sTBRJ3+xXWreUkcvJi68vUjIzu08EUVZiGcTYmQ dK8edqgsQC/bjWu/4FXmbNegRQn+iAden7FiD4x/2yZtAmjVGfhLJAxXUoH09GCVOVwx1l 1eLusJYasl3TJa517WWcQRiBHwWMpfb/vk5vUW3YxprW393TvvNFUgo8hGd64mGKxNT5bx ziIhbqZYg1dV+t61z8cLUAkTc0r73RbdlkqJboYm+cDlL08Icq9fwhMdAENNWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701963221; a=rsa-sha256; cv=none; b=eWeGp+eDZjCJgGDbmrnkER/bkuFjsMH4GcHeYZbQzc4L04jBoAzWbXpAKVa+98pbwbp9Ld yfRi7+ZKDwXljypk2Uo9kCFhrRMeN8zF4PSyz96Pk/YaJj8qGmWiUQnpu+ymR2CwajXd9z VZ+7+GKSFAwGPQdcl7r5Ia9jnfg0HF32bSbitf93QUUExv7Otk7CWStJqQPFm/5Bhnl4N9 tzztBJk1/L5h5Jab9b4uTSNNobjDKy6ZCffx4YXW35GcXYsfAtpVdf4jelMjAHbuyMMgQn chQ8V4NDlWDOsEXkdyx0KP5MndZv4yBss3YCQj6j76oypzDeVt9EuqIDYxmFiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701963221; 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=3tNraAyJfrJ2UtQ6cPNKwliGSMErHJmqAK+rVy3dHbA=; b=vNLUahg+h6HZ3KvfapjEFfENnRmDaAp59U7y6WMM7vQJkzz+fR9y5fj5RTTcwPro+Ae8Lb Eb7lXgTb2+IQSESQKWFmsts2tCKs/9kacOoO/KHHLPkAkUp4Nk8HctsmmxobbhJDEHsrTj A2NwbCEbHeFxC/StpYqvwAvlBrSBIo+NbRUIiqI2/a97ABaeGx2jPCEkbgjICtvwry4/Av 1hAQsGl7NytqspqxTXWfajWD4NVyYJYQ67yeX/kiUl9Za3biC64oLARkh4fdI/wIcFgjnT 0ypW3l56Cg2r5j1SOwrikituqFKkbrslLEdI5GsPQ9IfP+5SB3SnywBc139WbQ== Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) (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 4SmJFx50yDz8Tw; Thu, 7 Dec 2023 15:33:41 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-42589694492so6879471cf.1; Thu, 07 Dec 2023 07:33:41 -0800 (PST) X-Gm-Message-State: AOJu0YyitoUjxnmms46mQ6OzmfoJPYKIy1ebqqhNIeDWVJb5IwKR3jGo Ooe7LyV7YDqxMEqbEOgiHDNIeZArJDJKmMvqAI0= X-Google-Smtp-Source: AGHT+IG5ZFvQt4JzxoazCa+SW3pWxDRRXVPE82QZJeKsbvpxgdm+tR02o6ElVJMRPmq3ThKY0fgauY1jagxK6BUoGLg= X-Received: by 2002:ac8:59d3:0:b0:425:4043:5f20 with SMTP id f19-20020ac859d3000000b0042540435f20mr3137885qtf.94.1701963221353; Thu, 07 Dec 2023 07:33:41 -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: Thu, 7 Dec 2023 15:33:30 +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="0000000000003acb6b060bed31e6" --0000000000003acb6b060bed31e6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Jan, I can confirm that it worked fine :) https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D274405 Thanks! Nuno Teixeira escreveu no dia segunda, 27/11/2023 =C3=A0(s) 12:55: > Hello Jan, > > I'm waiting on 9b214a66ea8788a6da299139decf506a4b4f5ff1 commit to be MFHe= d > so I can proceed with wxgtk32. > > $ git cherry-pick -x 03eac77c103b637b316d6a73df7cae01986402cf (bump > consumers commit) > $ git checkout @ . > $ xargs -n1 portedit bump-revision -i 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 > > ##### > > 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-pic= k >> wasn't considered (PITA enough to discourage direct commits). >> >> [1] >> https://docs.freebsd.org/en/articles/committers-guide/#_considerations_w= hen_mfcing >> "Clearly mark direct commits ..." but ports/ tree is a probably >> more sloppy upholding this. >> > > > -- > Nuno Teixeira > FreeBSD Committer (ports) > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000003acb6b060bed31e6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Jan,

Thanks!

Nuno Teixeira <eduardo@freebsd.org> escreveu no dia seg= unda, 27/11/2023 =C3=A0(s) 12:55:
Hello Jan,

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

$ git cher= ry-pick -x 03eac77c103b637b316d6a73df7cae01986402cf (bump consumers commit)=
$ git checkout @ .
$ xargs -n1 portedit bump-revision -i </path/t= o/port.list (my consumers.list)
$ git add -u
$ git cherry-pick --cont= inue

I'm getting this result after `cherry-pic= k --continue`:

#####
*/*: Bump consu= mers of x11-toolkits/wxgtk32

New version of wxWidgets in tree
(cherry picked from 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/hug= in/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-runtime26/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/veracrypt/Makefile
#
# It looks like you may be commi= tting a cherry-pick.
# If this is not correct, please run
# =C2=A0 = =C2=A0 =C2=A0 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: =C2=A0 =C2=A0 =C2=A0Thu Nov 23 11:20:28 2023 +0000
## On branch 2023Q4
# Your branch is up to date with 'origin/2023Q4&= #39;.
#
# You are currently cherry-picking commit 03eac77c103b.
#<= br># Changes to be committed:
# =C2=A0 =C2=A0 =C2=A0 modified: =C2=A0 as= tro/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 modified: =C2=A0 cad/PrusaSlicer/Makefile
<snip= >
#####

<= div dir=3D"ltr" class=3D"gmail_attr">Jan Beich <jbeich@freebsd.org> escreveu no dia = domingo, 26/11/2023 =C3=A0(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.

=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)


--
Nuno Teixeira
FreeBSD Committ= er (ports)
--0000000000003acb6b060bed31e6--