Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

On Thu, 31 Dec 2020 at 02:50, Helge Oldach wrote: > > The only sensible way out is to retire mergemaster and switch to > etcupdate. This would affect any stable/1? users building from source. stable/11 and stable/12 users can continue to update via svn and have $FreeBSD$ expanded, for the life

No more update on stable/12

that's what I was thinking thanks. > I just removed the previous workspace and did git clone -b stable/12 --depth > 1 https://git.freebsd.org/src.git src ___ freebsd-stable@freebsd.org mailing list

Re: No more update on stable/12

I just removed the previous workspace and did git clone -b stable/12 --depth 1 https://git.freebsd.org/src.git src > On 30 Dec 2020, at 21:18, Tj wrote: > > Wait, what exactly did you do btw? I tried just switching the url and now > i'm getting "your branch and Origin/stable/12 have

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

On 12/23/20 11:58 AM, Warner Losh wrote: [...] mergemaster and etcupdate can cope without them. Warner [...] Until this moment, I had never heard of etcupdate, and I had mergemaster practically programmed into my fingers for system updates. So I read the man page for etcupdate, and it looks

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

On Thu, Dec 31, 2020 at 01:06:17PM +0200, Christos Chatzaras wrote: > ... > But the latest doc version has no reference about "mergemaster -p". > > So "mergemaster/etcupdate -p" is not needed if we use 12.2? > I used src/UPDATING (near the end, under "COMMON ITEMS", then "To rebuild

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

> Or I don't need "etcupdate -p" ? In > https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html > I > don't see that "mergemaster -p" is needed and I don't remember where I found > this command but

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

> No need to. etcupdate should merge back local changes and shout if it > can't. > So I run these commands? rm -fr /usr/src gitup release cd /usr/src make buildworld make buildkernel make installkernel etcupdate -p make installworld etcupdate Or I don't need "etcupdate -p" ? In

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

> On 31 Dec 2020, at 09:50, Helge Oldach wrote: > > Mergemaster is looking for "[$]${ID_TAG}:" (note the colon) which will > break with the git "$FreeBSD$" scheme. This makes autoupdate annoyingly > explicit as local changes to /etc files will no longer be recognized as > "accepted". > >

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

W dniu 31.12.2020 o 08:50, Helge Oldach pisze: Warner Losh wrote on Wed, 23 Dec 2020 17:58:10 +0100 (CET): On Wed, Dec 23, 2020 at 3:35 AM Marek Zarychta < zarychtam at plan-b.pwste.edu.pl> wrote: In file header, we have now only $FreeBSD$ since svn tags disappeared after the transition.