From nobody Sun Nov 26 20:29:01 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 4SdgKt0bsXz51fxr
	for <freebsd-ports@mlmmj.nyi.freebsd.org>; Sun, 26 Nov 2023 20:29:06 +0000 (UTC)
	(envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
	(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 "freefall.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4SdgKs4TB5z3Wp0;
	Sun, 26 Nov 2023 20:29:05 +0000 (UTC)
	(envelope-from jbeich@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1701030545;
	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=pByNEMr+BAsEX6XAm+oiZ8Fu9XzcE5FECoN1kC0OTdg=;
	b=RLh66YvotUsd2r2vMquWwDDAEyezLZib7Fw+fUus+uuskXVMfvh6HaMkQ9yEJ8BLzcysDE
	7sAwJALl+HL4KOVvyirqSjm33OlcsWtcNnG9RkFZRlaCUWc6P9Grjp0NsJMKHZAb0udZq9
	x/D7vz33QN/ZFQOtRUagQjDOb++mvIUeP0ttfuD2e59Jy2RCvMrN6gNCvfiIXXsfD7mffP
	J7+c2dc45F63QrjZB58Efzbxa65f3auWUz1MnqWDp+VH1LO5EriaxvK7j3C58kTZFFuSrl
	Gw1Vj49OqpOQSw17TKN+oZfyumzdnBiMPivPMDkpmzGMfJH0hTFaXGYq4z+Vzg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1701030545;
	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=pByNEMr+BAsEX6XAm+oiZ8Fu9XzcE5FECoN1kC0OTdg=;
	b=e94632LtkhLvjRnOy6oPxMI6mYBNOgJi8z1n7tD4DKvbdRvPvJfHEnI2gNk5WtPCEyLiI4
	fHIcq30JIP8EGQM4sanjCXaXKbC1etIu1lrrJhtnFzLX73Jt/3p2gIDD9RSGM5Z7tfoUba
	vgDX8R1srZogJGepD5DtZkHBjzttqCGscugt4iMPinfQHsY/4o4MikzZsYvc6f5RhK20Y8
	3uefI2uN1LdIa6fHTzAf/kkduPlDXMu2QbAAa0kvkoBm4iQPw62Lt+r7ez/cP4qhgLePFk
	70ZDo3B+ZmYXtfQ5Bpnci3ZmiZUcetjyGEVfl38MfLx1y8EG8dIRTedK26b2Ig==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701030545; a=rsa-sha256; cv=none;
	b=Tbkujh20zERJxeQ+sHUpfSs57YBYRse3Ksfmec56jJ3duMtVJrWOEJGwXNzBoyj5bOyIzB
	iYT6J1CAospNVf/DwABpe3ABSMii4AUdo7UdiSgoD4ciHx14O9my6oX/lW4anLcwYObEZN
	PrYcwygMUwjv1ytP7w5kY7Aors4d5IXHwI0XpDuSx0s+ZOUMxB/V78pvfJiWMDxEu4Awdv
	jQMjqkMupazv7XMTsBjzuy2rdm+HCyjQGKmhvepob0f9dM2R77YyS5mdLgT/5ZvYjQOh3B
	IJqMyvDWZ2BVtF95LFcFxZ5UHEKtunohYtS3ZApbgVd7TqWrGvnD+DKgDHbZMQ==
Received: by freefall.freebsd.org (Postfix, from userid 1354)
	id 54D6777AB; Sun, 26 Nov 2023 20:29:05 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: Nuno Teixeira <eduardo@freebsd.org>
Cc: FreeBSD Mailing List <freebsd-ports@freebsd.org>
Subject: Re: Best practice to bump consumers portrevision on quarterly
In-Reply-To: <CAFDf7UKFNP7yFDnTE0vp5-fJNUy0fkV3xUc672jauZPt4q+0_g@mail.gmail.com>
	(Nuno Teixeira's message of "Thu, 23 Nov 2023 11:30:21 +0000")
References: <CAFDf7UKFNP7yFDnTE0vp5-fJNUy0fkV3xUc672jauZPt4q+0_g@mail.gmail.com>
Date: Sun, 26 Nov 2023 21:29:01 +0100
Message-ID: <a5r0-5kdu-wny@FreeBSD.org>
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-ports
List-Help: <mailto:ports+help@freebsd.org>
List-Post: <mailto:ports@freebsd.org>
List-Subscribe: <mailto:ports+subscribe@freebsd.org>
List-Unsubscribe: <mailto:ports+unsubscribe@freebsd.org>
Sender: owner-freebsd-ports@freebsd.org
X-BeenThere: freebsd-ports@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain

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.