From owner-freebsd-current@freebsd.org Wed Dec 23 17:02:04 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 96B834C5722 for ; Wed, 23 Dec 2020 17:02:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 4D1KHv56x3z3h0r for ; Wed, 23 Dec 2020 17:02:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id g24so11659873qtq.12 for ; Wed, 23 Dec 2020 09:02:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BOA+J6Z7w3e4LMsKM1gFFHRjbAek4Ioeg2T8we6li4w=; b=jUOSM+oAYQIWXdg2tzyJCwKm1eLOb8UtNSS7QlIlypzWT8n9YYRQy6V7xVZ2p3weOU 5R3wXJF3yc2u8cVc7PQEzCfOiYtCqLJ4Ww9Wt0sjnkq0PoyLLLT+0fhQ0JcZx9l/569m JcjYYIAiuAlmf3o7bcARwxypQ+27ylXrT0HaTDXPh/v355Fh4gXdeRpLsUTii5CMUwkn NdFY/cwllrfN/7oUFfEkbCHsi2kSHpkY1ILxtUfbJ8xPxGYMPxVB/iIwSSV4mIifJa4x mT3usLmn61Wk1degoxWyDmE207DslHqVi1nXT/sofY8xTJWvyq2dS0ERQ3Tja55V+tEo d8Jg== X-Gm-Message-State: AOAM530hsIPjSnZ6N5wCVjL5/blueBr16zu5mpV7d7K/TlJ4bBrU1vb5 SRF7PTp20wL9GBP9QQAgV3hiTvARc2NX4QUAoQVNfA== X-Google-Smtp-Source: ABdhPJxhat8tjUG1W+pyMjy6OMOE+0yVqTXSpF0at3hsCM7NEzKkeTLthdBGTzNgd+6sEeI45+B0zl7wuDysKB93Qik= X-Received: by 2002:ac8:74d4:: with SMTP id j20mr26394105qtr.101.1608742922755; Wed, 23 Dec 2020 09:02:02 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 23 Dec 2020 10:01:51 -0700 Message-ID: Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: Michael Grimm Cc: FreeBSD Current , FreeBSD-STABLE Mailing List X-Rspamd-Queue-Id: 4D1KHv56x3z3h0r X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::834:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::834:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::834:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-current]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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 17:02:04 -0000 On Wed, Dec 23, 2020 at 7:32 AM 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? > 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. Warner