Date: Wed, 23 Dec 2020 13:00:18 -0500 From: Karl Denninger <karl@denninger.net> To: freebsd-stable@freebsd.org Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: <555bd9da-a106-c70c-0f1a-a6a5136a4d41@denninger.net> In-Reply-To: <CANCZdfrX-4ZbJ1EougMghzkiMJea=kyWmSutwBPMqXydPTTULA@mail.gmail.com> References: <CANCZdfrUsaw5jpN1ybpk0ADXdQYam0_NO0mPJd0-FMbuxPruhw@mail.gmail.com> <C47EED5D-2997-49FE-8D17-AD64E1317033@ellael.org> <CANCZdfrX-4ZbJ1EougMghzkiMJea=kyWmSutwBPMqXydPTTULA@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 12/23/2020 12:01, Warner Losh wrote: > On Wed, Dec 23, 2020 at 7:32 AM Michael Grimm <trashcan@ellael.org> wrote: > >> 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. >> 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? >> > I think the answer is a simple "git checkout NEW". This will replace the > current tree at branch OLD with the contents of branch NEW. > > git branch -m is different and changes what the branch means. If you did > what you suggested then you'd be renaming the OLD brnach to NEW, which > isn't what I think you're asking about. Correct -- "git checkout NEW" where "new" is the desired branch you wish to have "active." If you have made local changes it will tell you to act on that first; the usual is "git stash" to save them. You can then apply them with "git stash apply" to the *new* branch, assuming that makes sense to do (e.g. a kernel configuration file, etc.) "Stash" maintains a stack which can be manipulated as well (so a "stash" if you already "stash"ed and did not drop it creates a second one, aka "stash@(0) and stash@(1)". -- Karl Denninger karl@denninger.net <mailto:karl@denninger.net> /The Market Ticker/ /[S/MIME encrypted email preferred]/ [-- Attachment #2 --] 0 *H 010 `He 0 *H 00 H^Ōc!5 H0 *H 01 0 UUS10U Florida10U Niceville10U Cuda Systems LLC10U Cuda Systems CA1!0 U Cuda Systems LLC 2017 CA0 170817164217Z 270815164217Z0{1 0 UUS10U Florida10U Cuda Systems LLC10U Cuda Systems CA1%0#U Cuda Systems LLC 2017 Int CA0"0 *H 0 h-5B>[;olӴ0~͎O9}9Ye*$ g !ukvʶLzN`jL>MD'7U 45CB+kY`bd~b*c3Ny-78ju]9H euέsӬDؽmgwER?&UURj'}9nWD i`XcbGz \gG=u%\Oi13ߝ4 K44pYQr]Ie/r0+eEޝݖ0C15Mݚ@JSZ(zȏ NTa(25DD5.l<g[[Z arQQ%Buȴ~~`IohRbʳڟu2MS8EdFUClCMaѳ !}ș+2k/bųE,n当ꖛ\(8 WV8 d]b yXw ܊:I39 00 U ]^§Q\ӎ0U #0T039N0b01 0 UUS10U Florida10U Niceville10U Cuda Systems LLC10U Cuda Systems CA1!0 U Cuda Systems LLC 2017 CA @Ui0U 0 0U 0 *H :P U!>vJ n io -#ן]Wyu jǑR̀Q nƇ!G ѦF g\ yLx gw=OPycehf[ }ܷ['4ڝ\[p 6\o.B&JF" ZC{;*o*mcCcLY߾` t*S!(` ]DHP5A~/NPp6=mhk밣'doA$86hm5ӚS@ j ެEgl )0JG`%k35PaC?σ ׳HEt}!P㏏%*BxbQwaKG$6 h¦Mve; [o-Iی& I,Tc ߎ#t wPA@l0P+KXBպT zGv;NcI3&J ĬUPNa?/%W6G۟N000 k#Xd\ =0 *H 0{1 0 UUS10U Florida10U Cuda Systems LLC10U Cuda Systems CA1%0#U Cuda Systems LLC 2017 Int CA0 170817212120Z 220816212120Z0W1 0 UUS10U Florida10U Cuda Systems LLC10U karl@denninger.net0"0 *H 0 T[I-ΆϏ dn;Å@שy.us~_ZG%<MYd\gvfnsa1'6Egyjs"C [{~ _K Pn+<*pv#Q+H/7[-vqDV^U>f%GX)H.|l`M(Cr >е͇6#odc"YljҦln8@5SA0&ۖ"OGj?UDWZ5 dDB 7k-)9Izs-JAv J 6L$Ն1SmY.Lqw*SH;EF'DĦH]MOgQQ|Mٙג2Z9y@ y]}6ٽeY9Y2xˆ$T=e CǺǵbn֛{j |@LLt1[Dk5:$= ` M 00<+00.0,+0 http://ocsp.cudasystems.net:88880 U 0 0 `HB0U 0 U %0++03 `HB &$OpenSSL Generated Client Certificate0 U %՞V =;bzQ0U #0]^§Q\ӎϡ01 0 UUS10U Florida10U Niceville10U Cuda Systems LLC10U Cuda Systems CA1!0 U Cuda Systems LLC 2017 CA H^Ōc!5 H0 U 0karl@denninger.net0 *H ۠A0-j%--$% g2#ޡ1^>{K+uGE v1ş7Af&b&O; .;A5* U)ND2bF|\= ]<sˋL!wrw٧> YMÄ3\mWR hSv!_zvl? 3_ xU%\^#O*Gk̍YI_&Fꊛ@&1n } ͬ:{hTP3B.;bU8:Z=^Gw8 !k-@xE@i,+'Iᐚ:f hztX7/(hY` O.1}a`%RW^akǂpCAufgDix UTЩ/7}%=jnVZvcF<M= 2^GKH5魉 _O4ެByʈySkw=5@h.0z> W1000{1 0 UUS10U Florida10U Cuda Systems LLC10U Cuda Systems CA1%0#U Cuda Systems LLC 2017 Int CA k#Xd\ =0 `He E0 *H 1 *H 0 *H 1 201223180018Z0O *H 1B@%9DKmy8iqo<<O vqlML 2J-e0l *H 1_0]0 `He*0 `He0 *H 0*H 0 *H @0+0 *H (0 +7100{1 0 UUS10U Florida10U Cuda Systems LLC10U Cuda Systems CA1%0#U Cuda Systems LLC 2017 Int CA k#Xd\ =0 *H 10{1 0 UUS10U Florida10U Cuda Systems LLC10U Cuda Systems CA1%0#U Cuda Systems LLC 2017 Int CA k#Xd\ =0 *H %ɘUUc2DX,mOV +4JvՈ}? p6Z{u $p&bc# K56DŽ 2 b e~م2|K@ej?mc[ hrT7wbk2(.C/ }D L,5;އ7Oe<h~"[鬣dP_+p ~瞧].u片Uio_<ο;Ϡ- kqlzЊxmZČW%Zz!817ug߿BAǞc+̯vjˁ5G ]cʸCKTMr->sB3lX V2v)lxfYDc"IS 5B[fu.:N+ 脗پHUM# EHs碞 w_}3)F{aoa-WZnck ,1q#n 43Y ,|Da+<R#Zs'Bhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?555bd9da-a106-c70c-0f1a-a6a5136a4d41>