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

On Sun, 2021-01-03 at 19:02:24 +0100, Helge Oldach wrote: Hi all, I have deep cloned main from https://git.freebsd.org/src.git as described in the mini primer and started pulling updates. Now I'm stumbling over a bit of confusion: | hmo@p48 /usr/src $ git log -p e35a01eec6926bfb5c088ca8961079b5

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 of

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 l

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 everyth

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 https://ww

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". > > Furt

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. Addin

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

> Greetings, > The FreeBSD project will be moving it's source repo from subversion to git > starting this this weekend. The docs repo was moved 2 weeks ago. The ports > repo will move at the end of March, 2021 due to timing issues. > The short version is that we're switching the version control

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

Am 23.12.20 um 21:55 schrieb Ulrich Spörlein: > On Wed, 2020-12-23 at 12:19:47 -0800, John Kennedy wrote: >> On Mon, Dec 21, 2020 at 12:47:38PM -0800, John Kennedy wrote: >>> On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: >>> > The FreeBSD project will be moving it's source repo from

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

On Wed, 2020-12-23 at 12:19:47 -0800, John Kennedy wrote: On Mon, Dec 21, 2020 at 12:47:38PM -0800, John Kennedy wrote: On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: > The FreeBSD project will be moving it's source repo from subversion to git > starting this this weekend. The docs

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

On Mon, Dec 21, 2020 at 12:47:38PM -0800, John Kennedy wrote: > On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: > > The FreeBSD project will be moving it's source repo from subversion to git > > starting this this weekend. The docs repo was moved 2 weeks ago. The ports > > repo will mo

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

Renato Botelho wrote: > If you want to switch to a different already existing branch, as svn switch > does, you should look at git-checkout. > > It can be a bit expensive due to the size of src repository so if you do work > on multiple branches too often you can improve it using git-worktree.

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

Warner Losh wrote: > On Wed, Dec 23, 2020 at 7:32 AM Michael Grimm wrote: >> With svn I used: >>svn switch svn://svn.freebsd.org/base/stable/NEW /usr/src >> >> For git I found: >>git branch -m stable/OLD stable/NEW >>or >>git branch -M stable/OLD stable/NEW > >

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

On 12/23/2020 12:01, Warner Losh wrote: On Wed, Dec 23, 2020 at 7:32 AM Michael Grimm wrote: Hi, Warner Losh wrote: The FreeBSD project will be moving it's source repo from subversion to git starting this this weekend. First of all I'd like to thank all those involved in this for their

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

On Wed, Dec 23, 2020 at 7:32 AM Michael Grimm wrote: > Hi, > > Warner Losh wrote: > > > The FreeBSD project will be moving it's source repo from subversion to > git > > starting this this weekend. > > First of all I'd like to thank all those involved in this for their > efforts. > > Following >

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

On Wed, Dec 23, 2020 at 3:35 AM Marek Zarychta < zarych...@plan-b.pwste.edu.pl> wrote: > W dniu 17.12.2020 o 01:46, Warner Losh pisze: > > Greetings, > > > > The FreeBSD project will be moving it's source repo from subversion to > git > > starting this this weekend. The docs repo was moved 2 weeks

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

On 23.12.2020 18:04, Lev Serebryakov wrote: On 23.12.2020 17:32, Michael Grimm wrote: git-branch(1):     With a -m or -M option, will    be renamed to . If ==     had a corresponding reflog, it is renamed to    match  

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

On 23.12.2020 17:32, Michael Grimm wrote: git-branch(1): With a -m or -M option, will be renamed to . If == had a corresponding reflog, it is renamed to match , and a reflog entry is created to remembe

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

Hi, Warner Losh wrote: > The FreeBSD project will be moving it's source repo from subversion to git > starting this this weekend. First of all I'd like to thank all those involved in this for their efforts. Following https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md form yo

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

W dniu 17.12.2020 o 01:46, Warner Losh pisze: > Greetings, > > The FreeBSD project will be moving it's source repo from subversion to git > starting this this weekend. The docs repo was moved 2 weeks ago. The ports > repo will move at the end of March, 2021 due to timing issues. > > The short ver

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

On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: > The FreeBSD project will be moving it's source repo from subversion to git > starting this this weekend. The docs repo was moved 2 weeks ago. The ports > repo will move at the end of March, 2021 due to timing issues. ... I filed Bug

HEADS UP: FreeBSD src repo transitioning to git this weekend

Greetings, The FreeBSD project will be moving it's source repo from subversion to git starting this this weekend. The docs repo was moved 2 weeks ago. The ports repo will move at the end of March, 2021 due to timing issues. The short version is that we're switching the version control we're using