From owner-freebsd-current@freebsd.org Wed Dec 23 14:58:40 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 F0B4B4C1619; Wed, 23 Dec 2020 14:58:40 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1GYX1vlMz3F6N; Wed, 23 Dec 2020 14:58:39 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qk1-x731.google.com with SMTP id d14so15073748qkc.13; Wed, 23 Dec 2020 06:58:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=QO8LEsIRkAu6F87dzpL6P+ZSJtaS740ODmg5JgATpbQ=; b=Lg8CU14NJnPojqK6wXHifIgKlZ5P5ISoM/K1FTMCA8ul6gD4X7vyxlLMoY91jfqJQ1 3ohUiUyacEBFJPGLYgtkonUP41Y7OMIW9+mp6rnEeZuSEqLI0Vt+jLRIDSsQqfUu3j/D O53Nw17VPJ1C6E/2WZgzBs6KhOvSqCUZqUR2YNxxHCr9blLbYwHOmy+HEqhhMGf4CvLA wX0HK1Sw0Mb63uwf7vcrilzlgbS0MIIMpxMcqz1C5ejCUXLvutSAYRLI+sfcXdQefeyJ QV9snhMRVsQDqEppIprVMPkd7Bm/VHQSOOBYd6nUIQFf3zJmDDFTyJBVyjOhTcYNqW1r Ohlw== X-Gm-Message-State: AOAM530iByJgrXYmpJ18iuLBv/r1tiQchSw2I3adBXg21gppRiIhLILl UeEZvZJhaa9YxGc+Au8vbULxLVEi42Pzgg== X-Google-Smtp-Source: ABdhPJw4rS1n7wjQ2AZCJpA69/bgbknIE3tv+4gLZwtZx7L1+2m8AO5f7dojn1PdsBA94HFMp8OA6Q== X-Received: by 2002:a37:628b:: with SMTP id w133mr26916101qkb.247.1608735518806; Wed, 23 Dec 2020 06:58:38 -0800 (PST) Received: from mbp.home (200-12-5-188.rev.tribenet.com.br. [200.12.5.188]) by smtp.gmail.com with ESMTPSA id i13sm14913132qkk.83.2020.12.23.06.58.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Dec 2020 06:58:37 -0800 (PST) Sender: Renato Botelho Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: Michael Grimm , FreeBSD Current , FreeBSD-STABLE Mailing List References: From: Renato Botelho Message-ID: <0bce6fd0-7a54-b90a-ac6b-24226d77a87f@FreeBSD.org> Date: Wed, 23 Dec 2020 11:58:35 -0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D1GYX1vlMz3F6N X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.81 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-0.61)[-0.614]; FORGED_SENDER(0.30)[garga@FreeBSD.org,gargabsd@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::731:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_NEQ_ENVFROM(0.00)[garga@FreeBSD.org,gargabsd@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::731:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::731:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable,freebsd-current] 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:58:41 -0000 On 23/12/20 11:32, Michael Grimm wrote: > Hi, > > Warner Losh 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, 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? git-branch is used to create/delete/rename branches. If you want to switch to a different already existing branch, as svn switch does, you should look at git-checkout. It can be a bit expensive due to the size of src repository so if you do work on multiple branches too often you can improve it using git-worktree. -- Renato Botelho