From nobody Sun Apr 28 18:21:07 2024 X-Original-To: dev-commits-ports-main@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 4VSFCD6x1Sz5JjdL; Sun, 28 Apr 2024 18:21:12 +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 4VSFCD53wlz552P; Sun, 28 Apr 2024 18:21:12 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328472; 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=xafeLSx1vPsncGx+WxxWMS9dNfhwk6XIFNiu89Fl2hc=; b=ry0HUGvIzQgCU4d+MOmj5HwtTx+lWqxuDoPhmflmeiTM7RS+/2CCdEbeMEbjLxEtR4LPTP CqdzsoN5K+UH5rKQrpy5sDSBYHwhBG5VW9O1ZKyFD0EaWsTQi0ab/Nrtn6gFFGXEjH1asw eW6V/MZhjUkR91AXPKenk4HkVpb418raSS5G0TqMc3R3ysjPd07+BqZ24epMawTqUccRPY 8d2zbTtmy5iThjc5DNcvxU2UkJKlCt+obGkUgU9oeZUddEL0sF3v+BRJ/rZKjupsgtLagU DeLCyENGOR3XKbvWwBRaDssL2wJrFNLYP4S5/54iEnBiTNidOnNp34sDKPOVBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714328472; a=rsa-sha256; cv=none; b=TXcWMTXZcZoSm2u4fFBZ0kN38tGq/RZF0l6P6H1ELfMStuSMrPE9/ycC3OAOVqUqbz7LHN PkWcMeC2t6evvmNXjzc14jVHPjp/deazaDwiYI/G1nwmxSImZe7xpvZNQSnLVNOpUBMFOe IZNTt8W1xlFUzhZavCc2zwBWO5/v7UE1XnCvpLUasjNqUAjFvvsiRSAiJSGbtWUHpHp6qB 9ZMWaYrDVkR1plXAlv/CEGfoLxMh6Llu9U/m8wnIqH0tgfv5CwgDwpb8EtmjfcwFrvE8t+ MWgDnrNVbX5f3hjeYZ/+sObSLGny3ZRvrPG8BEwThQna8a2ajj8joKH/GOpLsQ== 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=1714328472; 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=xafeLSx1vPsncGx+WxxWMS9dNfhwk6XIFNiu89Fl2hc=; b=cUcNMhTYI/OFCPfKwmsfdQ/ktNjrFXQExqVuxWqXHCkTRjawd/zzAE3q/P1+AmvucP5h3y 1FHtW/bh5CFAMnwcIFLBzk6QHQ+WCUsPWWTqssUddiidodNOl8YRsR8nfekqBmQ8X53wYj 7qo5LthJr8x7AR8Gu36s9JkNwO86TnqvxQ+MuXpEO8erfN49+5h/MqXXplHJktXMq07b9P xSjQJezApxGb1O+WcFnoFo6BrJ8ZMW6aPGNwEU59aZ5ZeEn1oWJJVE5fYJVyduFtlPPHRI klU/JvBFpRgmOfSyWLAxGNSp5DLp/AbdmC9ecqrVDzP65kP+zSoOXaRnmdW4hg== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 2D2A9AFC4; Sun, 28 Apr 2024 18:21:12 +0000 (UTC) From: Jan Beich To: Emanuel Haupt Cc: 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: <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> (Emanuel Haupt's message of "Sun, 28 Apr 2024 14:49:59 +0200") References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org> <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> Date: Sun, 28 Apr 2024 20:21:07 +0200 Message-ID: List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain Emanuel Haupt writes: > Nuno Teixeira wrote: > >> Hello Emanuel, >> >> I did the same for my ports and I'm doing it when it applies to ports >> from PRs updates. >> Today I found a problem when I tried to cherry-pick a port without >> GNU_CONFIGURE_MANPREFIX fix as it appears that 2024Q2 doesn't have >> 9fd7ee1cdf6c applied. >> >> I've checked Mk/bsd.port.mk and it remains pointed to man and not >> share/man. >> >> Am I missing something? I was thinking that 2024Q2 was delayd because >> of this... >> >> Here is a case where I did remove manprefix fix and tried to >> cherry-pick to quarterly. >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278589 >> >> Cheers, > > That's the problem with sweeping commits: eventually, you make it > impossible to use cherry-pick because that would end up including the > entire commit, along with all other Makefiles it touched. In the past, > I've simply committed the change manually in the quarterly branch (git > commit, git push). Sweeping commits are atomic changes across many ports. Blob commits are many unrelated changes to the same port. The former is not supposed to be cherry-picked and causes merge conflicts while the latter can break build when cherry-picking if not careful. In post-Git world one it's easy to split changes into multiple commits, avoiding "while I'm here" blobs. That said, bug 278589 MFH looks trivial: $ git cherry-pick -x 09151791bf5e $ git reset @~1 $ git add -p # Skip GNU_CONFIGURE_MANPREFIX part $ git commit -c @{1}