From owner-freebsd-arm@freebsd.org Thu Dec 17 18:44:39 2020 Return-Path: Delivered-To: freebsd-arm@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 A69B14BFCC9 for ; Thu, 17 Dec 2020 18:44:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (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 4Cxgs26z27z4YfV for ; Thu, 17 Dec 2020 18:44:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72b.google.com with SMTP id w79so27351851qkb.5 for ; Thu, 17 Dec 2020 10:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eCM6N2KshKxV5n4vWVPPdF3H3i73mgEr975VN7IMPtc=; b=NY4EBURMGbEsg/htlBfOaY/Mx2KpSLuuy6u/GRv8EzJTeE+COf92nXgAP8fYHv33m+ kOxPhr4FZOJnVy0WVsjWnfLboh9R1DjFKdTA6Me26EJoVC76HTuA4CORYFcJuu9Go1PK 4DUNIM0n9fHmOahUIxLXfDTEjenWqCq1JNFIkJUn5G2GF03xBqvub2xJYn6OG18C3JtE 9oZpmpcBrzHYjiTuSfKxW27zMaXXFZKCjLcl2SYZs4XqpIffY3kmytKdJmKRKy71ovu8 PkMOt0VkZMf5KlT2Zxhyp8Nwj4EFZOgDB974X8KfFRWchR22hTplG2+hb3oNpH2jM/A9 e7hA== 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=eCM6N2KshKxV5n4vWVPPdF3H3i73mgEr975VN7IMPtc=; b=PsBB9jTaEPaPlwmFhvSvno+yWuiS2jly/BOhaj8WBIwgcK6W5FNUU25q4rmcdSrC0g qMHuUK0uVaoYWrCUJhnPRG5hHDl+ObxhWHFBuu24PyKcs5OFklDDb9ILCGKhgrWyQNDa oBktkFPCx7pRRVCLqFX4PYfILSlqniybR/xk4yyVTRPSMUkbggvzuuK0nYDkBRdNO+hj bCTgEwm2JnjbWCFneVLkHmdOuCtoVZAmeGW/IVOAlL903jYHG3V0RvePsqsj6dNJAzdo TzvmHaNgJGn+t8vdvhR9C8mArWPso6cFpX2DEx/y5KACPaL9VkKtWS4XoLIm6taxIEdt WyoA== X-Gm-Message-State: AOAM5307TEItyOYq2PwOIDGAX3TvCWyOGbzP6Yw3sNo1lli5PTdf6hKp 1RDGjrsvhUQPo6zRA/61FN+Yu2KhABHGlbNMh70Ye9wvwUFEYQ== X-Google-Smtp-Source: ABdhPJx2te0CipmdDx1um7sVuO8ny2BMgLSP8ie55elVgBTr2OPj8WoYOiyKhE7PSpLTYNSjNNgEmXZ4zk4WFYG2o8o= X-Received: by 2002:a37:4a4e:: with SMTP id x75mr669792qka.89.1608230677920; Thu, 17 Dec 2020 10:44:37 -0800 (PST) MIME-Version: 1.0 References: <20201217173836.GA31318@www.zefox.net> In-Reply-To: <20201217173836.GA31318@www.zefox.net> From: Warner Losh Date: Thu, 17 Dec 2020 11:44:27 -0700 Message-ID: Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: bob prohaska Cc: "freebsd-arm@freebsd.org" X-Rspamd-Queue-Id: 4Cxgs26z27z4YfV X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=NY4EBURM; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-arm@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72b:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72b:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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::72b: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-arm]; 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-arm@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Porting FreeBSD to ARM processors." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 18:44:39 -0000 On Thu, Dec 17, 2020 at 10:38 AM bob prohaska wrote: > > On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: > > The FreeBSD project will be moving it's source repo from subversion to > git > > starting this this weekend. The docs repo was moved 2 weeks ago. The > ports > > repo will move at the end of March, 2021 due to timing issues. > > > > Which of > git config pull.rebase false # merge (the default strategy) > git config pull.rebase true # rebase > git config pull.ff only # fast-forward only > is most appropriate for a test-only source tree? It would be > nice to preserve local changes, but nothing will ever get put > (pushed?) back to the repository. > > Apologies if the answer is in front of my nose! > 'git config pull.ff only ' is the safest for that scenario. It will ensure that you don't accidentally wind up with a polluted stream. You'll know your local copy is always the same as upstream. It's how I run in and I *DO* have things to push. When I have stuff in main and hit a collision between putting it there and pushing, I do a git pull --rebase, but that has some issues with merge commits, but since merge commits are confined to vendor branch support, that's usually OK for me. Warner