Re: src: continued use of Subversion for getting updates

2020-12-23 Thread Graham Perrin
Warner, thanks for the clarification. Apologies for me taking the (rough draft/work in progress) documentation too literally. On 23/12/2020 07:01, Warner Losh wrote: … This has been a big job with way more moving parts than I'd ever thought possible. We've attended to most of them, and are fi

Re: src: continued use of Subversion for getting updates

2020-12-23 Thread Warner Losh
On Wed, Dec 23, 2020, 1:48 AM Graham Perrin wrote: > Warner, thanks for the clarification. > > Apologies for me taking the (rough draft/work in progress) documentation > too literally. > I'm all ears on ways to make the docs better Warner On 23/12/2020 07:01, Warner Losh wrote: > > … This has

Re: src: continued use of Subversion for getting updates

2020-12-23 Thread Johan Hendriks
On 23/12/2020 09:49, Warner Losh wrote: On Wed, Dec 23, 2020, 1:48 AM Graham Perrin wrote: Warner, thanks for the clarification. Apologies for me taking the (rough draft/work in progress) documentation too literally. I'm all ears on ways to make the docs better Warner On 23/12/2020 07:01

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

2020-12-23 Thread Marek Zarychta
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: src: continued use of Subversion for getting updates

2020-12-23 Thread Thomas Mueller
> stable/11 as well as the releng branches for as long as the project has > them under support. I wrote the code to replay commits into subversion for > the convenience of our users on those branches. The 12.x releases will be > built out of Subversion to preserve $FreeBSD$ expansion and other obsc

Re: src: continued use of Subversion for getting updates

2020-12-23 Thread Jeffrey Bouquet
On Wed, 23 Dec 2020 11:13:07 +0100, Johan Hendriks wrote: > > On 23/12/2020 09:49, Warner Losh wrote: > > On Wed, Dec 23, 2020, 1:48 AM Graham Perrin wrote: > > > >> Warner, thanks for the clarification. > >> > >> Apologies for me taking the (rough draft/work in progress) documentation > >>

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

2020-12-23 Thread Kurt Jaeger
Hi! > It's also hard to collect ALL the keys of the devs at any point in > time to decide if that key is authorized to sign a commit in the > repo... We do have most of the keys in docs/share/pgpkeys/ plus history. > Like if a dev starts in 2021, any commits made by that > dev prior to 2021 shou

Re: git tools for building in base?

2020-12-23 Thread Ulrich Spörlein
On Fri, 2020-12-18 at 14:02:08 +0100, Miroslav Lachman wrote: On 25/11/2020 06:54, Thomas Mueller wrote: NetBSD users face a similar problem with their upcoming switch from cvs to hg (Mercurial). Do anybody have a link to some documents stating why FreeBSD chose Git and why NetBSD chose Merc

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

2020-12-23 Thread Michael Grimm
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: src: continued use of Subversion for getting updates

2020-12-23 Thread Steffen Nurpmeso
Jeffrey Bouquet wrote in : |On Wed, 23 Dec 2020 11:13:07 +0100, Johan Hendriks wrote: |> On 23/12/2020 09:49, Warner Losh wrote: |>> On Wed, Dec 23, 2020, 1:48 AM Graham Perrin \ |>> wrote: ... |> First of all a big thank you for all your time and effort you and all |> the other people p

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

2020-12-23 Thread Renato Botelho
On 23/12/20 11:32, 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 https://github.com/bsdimp/freebsd-git

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

2020-12-23 Thread Lev Serebryakov
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

2020-12-23 Thread Lev Serebryakov
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  

FreeBSD-CURRENT src: pulling without pushing: example Git commands to clone then update

2020-12-23 Thread Graham Perrin
On 23/12/2020 10:13, Johan Hendriks wrote: … For me and i think a lot of regular users that do not push just pull, a simple page with the exact commands to track stable or head is very appreciated. Like svnlite update /usr/src replace with git pull and so on and an example for head, sta

Re: src: continued use of Subversion for getting updates

2020-12-23 Thread Chris
On 2020-12-22 23:01, Warner Losh wrote: On Tue, Dec 22, 2020, 11:47 PM Graham Perrin wrote: On 23/12/2020 00:10, Paul Mather wrote: > … continue to get src updates via Subversion. … As far as I can tell: * for stable/12 alone stable/11 as well as the releng branches for as long as the pro

FreeBSD: GitLab

2020-12-23 Thread Graham Perrin
On 23/12/2020 15:36, Chris wrote: … Any plans to incorporate GitLab into any of this? ▶ big-picture.md is probably the best starting point. ___ freebsd-current@freebsd.org mailing list

Re: git tools for building in base?

2020-12-23 Thread Miroslav Lachman
On 23/12/2020 13:54, Ulrich Spörlein wrote: On Fri, 2020-12-18 at 14:02:08 +0100, Miroslav Lachman wrote: On 25/11/2020 06:54, Thomas Mueller wrote: NetBSD users face a similar problem with their upcoming switch from cvs to hg (Mercurial). Do anybody have a link to some documents stating why

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

2020-12-23 Thread Steffen Nurpmeso
John-Mark Gurney wrote in <20201223023242.gg31...@funkthat.com>: |Steffen Nurpmeso wrote this message on Fri, Dec 18, 2020 at 19:28 +0100: |> Brooks Davis wrote in |> <20201218175241.ga72...@spindle.one-eyed-alien.net>: |>|On Thu, Dec 17, 2020 at 05:53:20PM -0800, Thomas Mueller wrote: ...

Re: FreeBSD: GitLab

2020-12-23 Thread Chris
On 2020-12-23 07:41, Graham Perrin wrote: On 23/12/2020 15:36, Chris wrote: … Any plans to incorporate GitLab into any of this? ▶ big-picture.md is probably the best starting point. Brilliant! :) I mainly asked because GitLab s

Re: FreeBSD: GitLab

2020-12-23 Thread Warner Losh
On Wed, Dec 23, 2020 at 9:44 AM Chris wrote: > On 2020-12-23 07:41, Graham Perrin wrote: > > On 23/12/2020 15:36, Chris wrote: > > > >> … Any plans to incorporate GitLab into any of this? > > > > > > ▶ > > big-picture.md is > > probably

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

2020-12-23 Thread Warner Losh
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: FreeBSD: GitLab

2020-12-23 Thread Chris
On 2020-12-23 08:52, Warner Losh wrote: On Wed, Dec 23, 2020 at 9:44 AM Chris wrote: On 2020-12-23 07:41, Graham Perrin wrote: > On 23/12/2020 15:36, Chris wrote: > >> … Any plans to incorporate GitLab into any of this? > > > ▶ > big

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

2020-12-23 Thread Brooks Davis
On Tue, Dec 22, 2020 at 06:32:43PM -0800, John-Mark Gurney wrote: > Steffen Nurpmeso wrote this message on Fri, Dec 18, 2020 at 19:28 +0100: > > Brooks Davis wrote in > > <20201218175241.ga72...@spindle.one-eyed-alien.net>: > > |On Thu, Dec 17, 2020 at 05:53:20PM -0800, Thomas Mueller wrote: > >

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

2020-12-23 Thread Warner Losh
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

2020-12-23 Thread Michael Grimm
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

2020-12-23 Thread Michael Grimm
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

2020-12-23 Thread Renato Botelho
On 23/12/20 15:20, Michael Grimm wrote: 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 c

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

2020-12-23 Thread John Kennedy
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

2020-12-23 Thread 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 subversion to git > starting this this weekend. The docs

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

2020-12-23 Thread Rainer Hurling
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

referencing one commit in another for git

2020-12-23 Thread Rick Macklem
Hi, So I just did my first git commit. Pretty scary, but it looks ok. Now, how do I reference one commit in another related commit's log? By the long winded hash or ?? I'm not sure if I should ask here or on the git mailing list, but I figured this isn't a technical git question... Thanks for

Re: referencing one commit in another for git

2020-12-23 Thread Alan Somers
On Wed, Dec 23, 2020 at 3:16 PM Rick Macklem wrote: > Hi, > > So I just did my first git commit. Pretty scary, but it looks ok. > > Now, how do I reference one commit in another related > commit's log? > > By the long winded hash or ?? > > I'm not sure if I should ask here or on the git mailing l

Re: referencing one commit in another for git

2020-12-23 Thread Warner Losh
On Wed, Dec 23, 2020, 3:21 PM Alan Somers wrote: > On Wed, Dec 23, 2020 at 3:16 PM Rick Macklem wrote: > > > Hi, > > > > So I just did my first git commit. Pretty scary, but it looks ok. > > > > Now, how do I reference one commit in another related > > commit's log? > > > > By the long winded ha

Re: referencing one commit in another for git

2020-12-23 Thread Jan Beich
Warner Losh writes: > On Wed, Dec 23, 2020, 3:21 PM Alan Somers wrote: > >> On Wed, Dec 23, 2020 at 3:16 PM Rick Macklem wrote: >> >> > Hi, >> > >> > So I just did my first git commit. Pretty scary, but it looks ok. >> > >> > Now, how do I reference one commit in another related >> > commit's l

Re: git tools for building in base?

2020-12-23 Thread Charlie Li
Ulrich Spörlein wrote: > I don't fully recall, but I think that the hg conversion was slow and > the disk space needed was quite a bit more than git. > One of Mercurial's biggest design principles is immutable history (with history rewriting disabled by default), so increased disk space compared t

Re: referencing one commit in another for git

2020-12-23 Thread Warner Losh
On Wed, Dec 23, 2020 at 6:22 PM Jan Beich wrote: > Warner Losh writes: > > > On Wed, Dec 23, 2020, 3:21 PM Alan Somers wrote: > > > >> On Wed, Dec 23, 2020 at 3:16 PM Rick Macklem > wrote: > >> > >> > Hi, > >> > > >> > So I just did my first git commit. Pretty scary, but it looks ok. > >> > >

Re: FreeBSD: GitLab

2020-12-23 Thread grarpamp
>> I mainly asked because GitLab seems to offer a richer toolset IMHO. > > The project is publishing many places, and will use features of the places > it publishes as it refines the future workflow. The different > mirroring/hosting services offer different features and it's not yet clear > how we