Date: Sun, 28 Apr 2024 13:56:36 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: Emanuel Haupt <ehaupt@freebsd.org> Cc: 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 Message-ID: <CAFDf7UJnTDD61vBmPsYDXsgxje1AxLp7XKJYNeAF0omQP4Os_w@mail.gmail.com> In-Reply-To: <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org> <CAFDf7UJ1xcJLL5t%2BK6VGtN7T4vA9a4TtoRR9pr2N34EcRUO85g@mail.gmail.com> <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] 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 [-- Attachment #2 --] <div dir="ltr"><div>Ok, I understand it as I misunderstood 2024Q2 was including manprefix update.</div><div><br></div><div>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?<br><br></div><div>Thanks<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Emanuel Haupt <<a href="mailto:ehaupt@freebsd.org">ehaupt@freebsd.org</a>> escreveu (domingo, 28/04/2024 à(s) 13:50):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Nuno Teixeira <<a href="mailto:eduardo@freebsd.org" target="_blank">eduardo@freebsd.org</a>> wrote:<br> > Hello Emanuel,<br> > <br> > I did the same for my ports and I'm doing it when it applies to ports<br> > from PRs updates.<br> > Today I found a problem when I tried to cherry-pick a port without<br> > GNU_CONFIGURE_MANPREFIX fix as it appears that 2024Q2 doesn't have<br> > 9fd7ee1cdf6c applied.<br> > <br> > I've checked Mk/<a href="http://bsd.port.mk" rel="noreferrer" target="_blank">bsd.port.mk</a> and it remains pointed to man and not<br> > share/man.<br> > <br> > Am I missing something? I was thinking that 2024Q2 was delayd because<br> > of this...<br> > <br> > Here is a case where I did remove manprefix fix and tried to<br> > cherry-pick to quarterly.<br> > <a href="https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278589" rel="noreferrer" target="_blank">https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278589</a><br>; > <br> > Cheers,<br> <br> That's the problem with sweeping commits: eventually, you make it<br> impossible to use cherry-pick because that would end up including the<br> entire commit, along with all other Makefiles it touched. In the past,<br> I've simply committed the change manually in the quarterly branch (git<br> commit, git push).<br> <br> Since 2024Q2 was branched before the GNU_CONFIGURE_MANPREFIX change,<br> you'll need to keep the band-aid in the quarterly branch for this cycle.<br> </blockquote></div><br clear="all"><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888"> FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div>;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJnTDD61vBmPsYDXsgxje1AxLp7XKJYNeAF0omQP4Os_w>