Date: Wed, 23 Dec 2020 15:32:13 +0100 From: Michael Grimm <trashcan@ellael.org> To: FreeBSD Current <freebsd-current@freebsd.org>, FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: <C47EED5D-2997-49FE-8D17-AD64E1317033@ellael.org> In-Reply-To: <CANCZdfrUsaw5jpN1ybpk0ADXdQYam0_NO0mPJd0-FMbuxPruhw@mail.gmail.com> References: <CANCZdfrUsaw5jpN1ybpk0ADXdQYam0_NO0mPJd0-FMbuxPruhw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi, Warner Losh <imp@bsdimp.com> 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, <oldbranch> will be renamed to = <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C47EED5D-2997-49FE-8D17-AD64E1317033>