Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Sep 2020 09:47:06 -0700
From:      Steve Kargl <sgk@troutmask.apl.washington.edu>
To:        Ed Maste <emaste@freebsd.org>
Cc:        Kurt Jaeger <pi@freebsd.org>, "Greg 'groggy' Lehey" <grog@freebsd.org>, FreeBSD Current <freebsd-current@freebsd.org>
Subject:   Re: Plans for git (was: Please check the current beta git conversions)
Message-ID:  <20200902164706.GA49777@troutmask.apl.washington.edu>
In-Reply-To: <CAPyFy2ANWEiA2ndE6qr_kY=sPuY%2BeaAZg=apWo0OZPVC7pkwkg@mail.gmail.com>
References:  <CAPyFy2CTTecRJDnXNvF%2BM2%2BaLWJpA%2BEdG43ZeU3qwsCruecoFA@mail.gmail.com> <20200902045939.GA15897@eureka.lemis.com> <20200902060117.GG53210@home.opsec.eu> <20200902063136.GA47543@troutmask.apl.washington.edu> <CAPyFy2ANWEiA2ndE6qr_kY=sPuY%2BeaAZg=apWo0OZPVC7pkwkg@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Sep 02, 2020 at 12:14:08PM -0400, Ed Maste wrote:
> On Wed, 2 Sep 2020 at 02:31, Steve Kargl
> <sgk@troutmask.apl.washington.edu> wrote:
> >
> > > A short intro on git for svn users:
> > > https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view
> > >
> >
> > ROTFL.  From the "short intro", 2nd sentence.
> >
> > New committers are assumed to already be familiar with the basic
> > operation of Git.  If not, start by reading the Git Book.
> 
> This doc started as a direct translation of the Subversion primer,
> which has as its first sentence:
> > New committers are assumed to already be familiar with the basic operation of Subversion. If not, start by reading the Subversion Book.
> 
> As with the Subversion primer the doc is intended to provide a quick
> reference for day-to-day commands, but not act as a reference or
> introduction to the entire theory of operation of the associated VCS.

Like GCC, which did the svn to git dance at start of the year,
FreeBSD is throwing away a decade+ of corporate knowledge of
working with svn and /usr/src.  What is needed is a succinct
translation of the most common svn commands translated to git.

Checking out /usr/src as user@freebsd.org

  svn checkout svn+ssh://user@svn.freebsd.org/base/head /usr/src

  git ...

Checking out /usr/src without freebsd.org account

  svn checkout https://svn.freebsd.org/base/head ${HOME}/freebsd/src

  git ...

Creating diff against updated head.

  svn update
  svn diff > patch.diff

  git ...

Adding a new file

  svn add /usr/src/libm/msun/src/_s_sinpi.c

  git ...

Committing a change to /usr/src

  svn update
  svn diff <files-to-commit> | more (everyone does one last check, right?)
  svn commit <files-to-commit>

  git ...

-- 
Steve



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200902164706.GA49777>