From owner-freebsd-git@freebsd.org Sun Oct 4 17:49:17 2020 Return-Path: Delivered-To: freebsd-git@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 6465E42E1C0 for ; Sun, 4 Oct 2020 17:49:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4C4B7K1S5Gz41Tk for ; Sun, 4 Oct 2020 17:49:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 31D9642E623; Sun, 4 Oct 2020 17:49:17 +0000 (UTC) Delivered-To: git@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 31A4F42E1BF for ; Sun, 4 Oct 2020 17:49:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) (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 4C4B7J35Zzz41W8; Sun, 4 Oct 2020 17:49:16 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f170.google.com with SMTP id l16so5789567ilt.13; Sun, 04 Oct 2020 10:49:16 -0700 (PDT) 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=fSO06qfmtrtkhmTWv2dsSAS1yX6EeVYF1aRIowns5V8=; b=mR4tp78ghMb5KGxbFWlkCpZYHG3Om8y/kuxq6LdL6stp7/8VEd+u5O098+oTIQKM4j CuOFWTFm+ece/JGNgM9s0w65cFTwnrq7v87JbwGzCskWseHfgT1E52NoAyxEH2iNYcm4 WJZmlEGT7urDHgtkFeDCVcxCWLBhvZO6EU9EDzRErykFdhNliXRnuynptkVDx/DzeUyE 2h4Pi+v0i5GUer6Evf/mFNryIR3UVbrALf3F5oIsVULeEgEjK9kCqU3C91Eoda9ul72u HvEGygIX97/AMG8316zVRgYh27+5wpuLtzRq3yGIu6z3AFDSvuPx5ewkp7tD0QImSmdY GlHg== X-Gm-Message-State: AOAM5302eUZrWDUz0ClPmfrxasbxVVHSP78Wp1kU42tIwzfOAQVwQMoX nXV7z9dmPRpViTQtwhP+fHInOvyB1rbWCJS6gtk= X-Google-Smtp-Source: ABdhPJxGV00TFK/cWh+S2UzRsozSttNjH7vb+ccBSYAJpLtQ0cJ/ChPNpdnW9pQ6hnKu2UagyTMgOPpfdWUZ0EXRLKY= X-Received: by 2002:a92:d742:: with SMTP id e2mr8373645ilq.11.1601833755069; Sun, 04 Oct 2020 10:49:15 -0700 (PDT) MIME-Version: 1.0 References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> <20200926020946.GK1390@albert.catwhisker.org> <20200926124212.GL92039@acme.spoerlein.net> <20201003223531.GA77534@albert.catwhisker.org> In-Reply-To: <20201003223531.GA77534@albert.catwhisker.org> From: Ed Maste Date: Sun, 4 Oct 2020 13:49:03 -0400 Message-ID: Subject: Re: Question on (my) workflow migration svn -> git To: David Wolfskill Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4C4B7J35Zzz41W8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.170 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.09 / 15.00]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.990]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.15)[-0.153]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.170:from]; NEURAL_HAM_MEDIUM(-0.95)[-0.952]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.170:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; MAILMAN_DEST(0.00)[git]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Oct 2020 17:49:17 -0000 On Sat, 3 Oct 2020 at 18:35, David Wolfskill wrote: > > As noted earlier, that seems to have worked. However, subsequent to > your "Heads up: beta git repo hashes changing this weekend" notice, I > attempted a "git fetch" within that bare repo, and -- as I ratehr > expected, git was ... singularly unhappy about the exercise.' Indeed. Let me reiterate though that this is a consequence of fine-tuning the conversion process; once the migration is complete it should not happen again. Deleting and cloning again from scratch is a reasonable way to interact with the repository during this stage. > That is not waht I'm trying to do. I am trying to have a (separate) > working copy (for each branch I use) that persists from day to day, and > which I update from the repo shortly before I rebuild FreeBSD. For the time being I think that you'd want to remove the bare repo and worktrees, and recreate everything from scratch over a hash change.