From owner-freebsd-current@freebsd.org Wed Dec 23 14:32:26 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 2BD734C054F; Wed, 23 Dec 2020 14:32:26 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx1.enfer-du-nord.net (mx1.enfer-du-nord.net [IPv6:2001:41d0:302:1100::e:1def]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1FzD5sTlz3CMq; Wed, 23 Dec 2020 14:32:23 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:fc01:958a:3805:d7e4:4d3e] (p200300fB4f00fC01958A3805D7E44D3e.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:fc01:958a:3805:d7e4:4d3e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.enfer-du-nord.net (Postfix) with ESMTPSA id 4D1Fz3689dzdPS; Wed, 23 Dec 2020 15:32:15 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Date: Wed, 23 Dec 2020 15:32:13 +0100 References: To: FreeBSD Current , FreeBSD-STABLE Mailing List In-Reply-To: Message-Id: X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D1FzD5sTlz3CMq X-Spamd-Bar: - X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:41d0:302:1100::e:1def:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[ellael.org]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[2001:41d0:302:1100::e:1def:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 14:32:26 -0000 Hi, Warner Losh wrote: > The FreeBSD project will be moving it's source repo from subversion to = git > starting this this weekend.=20 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 = your other mail I was able to migrate from svn to git without running = into any issues. Right now I am learning how to use git the way I sed svn before. I am = just following 12-STABLE in order to build world and kernel. I am not = developing, neither am I committing. I wonder how one would switch from a currently used branch (OLD) to = another branch (NEW). 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 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 remember the branch renaming. If exists, -M must be used to force the = rename to happen. I don't understand that text completely, because I don't know what a = reflog is, yet ;-) Thus: Should I use "-m" or "-M" in my scenario when switching from = stable/12 to stable/13 in the near future? Thanks and regards, Michael