From nobody Sun Apr 28 18:44:44 2024 X-Original-To: dev-commits-ports-all@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 4VSFkV2NZgz5JlJY; Sun, 28 Apr 2024 18:44:50 +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 4VSFkV00q8z56t5; Sun, 28 Apr 2024 18:44:50 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714329890; 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=mRgFVK2Nejze5pA8QtcHN4pQrIrrXHEv/Ws52zSkqe0=; b=bHDx/hfBC+iNdJFKOpPHGjAwvxOCw/6598n6R9H/Ur1ddLzQcyMkjv9euCyELJuPBqgB/1 83GszL3uyeCLbWA1+DT9EeN54QX4bEmKfWZwM5fAvM6dS7MdeCziXVjb7ndlrKAeRpWPJ2 EwLypfiJZgWKCnJRUhgB/SHpqovbSmU3ae8d7BGhelVtAvWoTuOU3PF/qqhiG9c1xZ2/Oi EdWIzdadEVfZzsmnYbFAsKaxws+pDWSD0tC1SoeTclUBORelvAF5R5AINb/aluhfnet+7t L7Sfvwrqfu9NyJCtNa+XoyBT7hCGSVCtwkhYPL3R82Lk7eGgQ726S0Ga8jEzaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714329890; a=rsa-sha256; cv=none; b=QAYk2DbYqA3bnc2IDNzga6PvBy7evPry/fiSpBqKJN3vNeBPyO4ShgkOVnzdetDEblUz/T kE9/kfJNyiyUEESILkP6FTt6ri8f65SNrEJy4z1T5j66Lt/OGg+hrLPdrbEkRtbZ2j7wX/ sjAxMCQAIiZZfduxTHZgFkecuJJEKiwqN+9ud4s2vie6LJh+UGPMiKM9+y2NI/nCJkw0Ic bOpNlxHP5/Xl81mMk/Dgo/FpP8YfHf9g787pDKvLSnTTqTX8PT5zFdfk1Ck18MZ5aXu4Av 1aYpkEOkhjIq/c40P7ARmiFNUvV9KhCZF71GdTiYRjQAL2FP7LtnCdsZMAmL7g== 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=1714329890; 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=mRgFVK2Nejze5pA8QtcHN4pQrIrrXHEv/Ws52zSkqe0=; b=CYr2mT1t1bQ73j+PPPk8Sm+OqbMjMF76RuufrOj0p3TbdRBkbqFjpxJtYuRN9KQNtJSA0f e0aZyIJkT3Qp0+YRDuoNRvJpqCl+Gv+xPksMDCjqmbq7sSXiq9TUlD7VI7i76RqkRq6YsH t8vkHFPPvFTTCwdgTejzaJ2sONCkSBJbsQchzhcv7cbwH8DArWZYIECREnXf88cp/2MMya ysVazhA2jcCNoW9kjM9VmvNFBMFYSC7DehlEPPLRVZawYekm+GsfTzI0KQVxt8ZiupYcpo UAeVMwz8pfvOzuBYqJpCytsitVz/SIcPKtTOT2FV7Pbnc5j9Bf6tXqFv4yck5g== Received: by freefall.freebsd.org (Postfix, from userid 1354) id CAB24B21E; Sun, 28 Apr 2024 18:44:49 +0000 (UTC) From: Jan Beich To: Florian Smeets Cc: Emanuel Haupt , Nuno Teixeira , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX In-Reply-To: <9dc94105-846e-44c9-a32a-8409dbb0c3e1@FreeBSD.org> (Florian Smeets's message of "Sun, 28 Apr 2024 17:06:49 +0200") References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org> <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> <20240428152014.a3dc14906b9df118bcc84d34@FreeBSD.org> <9dc94105-846e-44c9-a32a-8409dbb0c3e1@FreeBSD.org> Date: Sun, 28 Apr 2024 20:44:44 +0200 Message-ID: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain Florian Smeets writes: > On 28.04.24 15:20, Emanuel Haupt wrote: > >> Nuno Teixeira wrote: >>> Ok, I understand it as I misunderstood 2024Q2 was including manprefix >>> update. >>> >>> But taking your commit as an example, since manprefix fix was removed >>> from all your ports what happens if you need a cherry-pick to >>> quarterly in the future? >> As I said, I'd manually copy the files from main, make the necessary >> modifications (i.e., specify GNU_CONFIGURE_MANPREFIX), and then perform >> a git commit/push with sufficient references explaining why. >> > > Yes, you would need to do a direct commit, and explain why it's > necessary. It should be handled the same as in src, so no approval is > required or anything. Just exercise caution and have a rationale. > > See cbaccc953d55 and 7555ec6eeba0 for examples. Would be nice to standardize direct commit annotation. For example, during Subversion days I've appended "(direct commit)" to summary line and during Git days mimicked "git cherry-pick -x" footer. $ for b in $(git branch --remote -l origin/\*Q\*); do PAGER=cat git log --oneline --committer=jbeich --grep="direct commit" $b; done | wc -l 23