From owner-freebsd-current@freebsd.org Wed Sep 2 16:47:09 2020 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B5CD3DC7E4 for ; Wed, 2 Sep 2020 16:47:09 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhVGP1SLGz3VtT; Wed, 2 Sep 2020 16:47:08 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.16.1/8.16.1) with ESMTPS id 082Gl6xH050025 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 2 Sep 2020 09:47:06 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.16.1/8.16.1/Submit) id 082Gl6mB050024; Wed, 2 Sep 2020 09:47:06 -0700 (PDT) (envelope-from sgk) Date: Wed, 2 Sep 2020 09:47:06 -0700 From: Steve Kargl To: Ed Maste Cc: Kurt Jaeger , "Greg 'groggy' Lehey" , FreeBSD Current Subject: Re: Plans for git (was: Please check the current beta git conversions) Message-ID: <20200902164706.GA49777@troutmask.apl.washington.edu> References: <20200902045939.GA15897@eureka.lemis.com> <20200902060117.GG53210@home.opsec.eu> <20200902063136.GA47543@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4BhVGP1SLGz3VtT X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:73, ipnet:128.95.0.0/16, country:US]; REPLY(-4.00)[] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:47:09 -0000 On Wed, Sep 02, 2020 at 12:14:08PM -0400, Ed Maste wrote: > On Wed, 2 Sep 2020 at 02:31, Steve Kargl > 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 | more (everyone does one last check, right?) svn commit git ... -- Steve