Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX
Date: Sun, 28 Apr 2024 12:56:36 UTC
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? Thanks Emanuel Haupt <ehaupt@freebsd.org> escreveu (domingo, 28/04/2024 à(s) 13:50): > Nuno Teixeira <eduardo@freebsd.org> 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). > > Since 2024Q2 was branched before the GNU_CONFIGURE_MANPREFIX change, > you'll need to keep the band-aid in the quarterly branch for this cycle. > -- Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org