Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Jun 2020 12:45:51 +0200
From:      Mathieu Arnold <mat@freebsd.org>
To:        Dan Langille <dan@langille.org>
Cc:        freebsd-git@freebsd.org
Subject:   Re: svn primer translation to git
Message-ID:  <20200626104551.uvz6reexkh33myrg@aching.in.mat.cc>
In-Reply-To: <78984441-460D-477F-939A-9F7237DAD757@langille.org>
References:  <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com> <20200625165547.GA75705@spindle.one-eyed-alien.net> <CAHevUJE-Es=8sw6zGioS-UuaQNhhkbGJZdG9hbsosS7ENYUY-g@mail.gmail.com> <20200625171314.GB75705@spindle.one-eyed-alien.net> <CANCZdfow92K_a-60VyzhkkCMg7MjXfJz1zwSisGTT1qdTCD31g@mail.gmail.com> <20200625180621.GC75705@spindle.one-eyed-alien.net> <78984441-460D-477F-939A-9F7237DAD757@langille.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--ob3nznqgqmjkus5b
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jun 25, 2020 at 02:10:59PM -0400, Dan Langille wrote:
> > On Jun 25, 2020, at 2:06 PM, Brooks Davis <brooks@freebsd.org> wrote:
> >=20
> > There's a time and place for many foot cannons, but there's no need to
> > even mention them in our documentation unless it's completely essential.
> > People can explore the infinite vastness of git options on their own.
>=20
> There ^
>=20
> Limit the primer to the usual work flow that committer should follow.
>=20
> Put unusual workflows to other documentation.
>=20
> Show me how to get the ports tree, make a change, check it in.
>=20
> Cover common things we used to do, and how to do them now.
>=20
> For example svn cp, when moving something in the ports tree
> (say from one category to another).  What do we do with git?

That is something we need to decide.

git does not track copies and moves, it only tries to figure it out
after the fact.

So, we could decide we don't care about history and just copy files
around and change them.

We could try to help git by creating a short term branch where you first
copy the files, commit, then modifiy them, commit, then merge without
fast forward.

Or we could do something else entirely.

--=20
Mathieu Arnold

--ob3nznqgqmjkus5b
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAl710dpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2
MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd
fgIxkg/+PS/36CarSqLc9w3i/CbKvyJ9ZeBCjRTL9kLUPOovF0Qq3Z37PY7xw+tN
OW9mP76+64bJNDkIVYFUpzL1WmzAla8fGU2I4JtgMxKl5d5z6u5rngKNDfr0tLvx
lPNNhu/V7kVbT8dkhxIwFCJ0JSl1EYil+p1ABqqJteVxdBcX45vgbrUNr0Cv7Oah
fbgUWBEpALbhaTZUX+WlOrHk0csrtEpRGYk0X0K3P2a+xZLis2SPdc73lxnx5cyc
72kfIBWXRoA9OxThAAT67XgF7lhVbHRF4jeRtovXKPG6H+C8TKukWaCBsReOgo3O
sMzUi70SLDKPOHBm5KJIKoHSmhBBQr50uDlPcLXFQdSxcmau5+SpmaPaR+P51ePx
MtPQCX3J8ZIbBcocuMruzYi6l0KPZlvleJWwApyw0cNVplgTi2lyrTrKuBnDcc8N
osWUFALKIsU3tqda/FGzld/w9M9Cqc9+UrMKISJTfGCKnmlFDE7B2hnsXQYoS9Da
NaxCKTMlfxg3R4SPHHN6uMjq1PNwJztzmIysmFtciZMzFs9KHByc+BHsrvW9oT7A
kt9NYzHD3PsycetskyEdiB3BfSUHlmUTl9+MD4FS6oRcFLXXGJtf+Ttsd64Hhb7z
50pbipE2iza7uRZTzPrAkJSaMoYSYjbg28oaJMPtnjvblrDFb0w=
=2gQr
-----END PGP SIGNATURE-----

--ob3nznqgqmjkus5b--



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