From owner-freebsd-git@freebsd.org Tue Oct 1 14:22:09 2019 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 4E2331379E4 for ; Tue, 1 Oct 2019 14:22:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 46jM0c3dHfz3QQ5 for ; Tue, 1 Oct 2019 14:22:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io1-xd31.google.com with SMTP id h144so48311649iof.7 for ; Tue, 01 Oct 2019 07:22:08 -0700 (PDT) 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=7GnKtsbSjQET99vYRPaqlKo8Hvy4D9uW+T4E5gR3BOY=; b=NitAevDpvXDHglevmHZplTPGcmW0A2HuJB/v4M5gqQQumEq4N2gSBRlGtCsJONn6Ur 3BE9eEwdP96+Tjt3jR8KWvJqyTaiuoHmmcwwHYojKjxfM2463UUE+O1RnjYEQaiJmE/A AATYwVyleE+kgojUc0E55Y34mb+sW6QnOfN6jsVirqc35bja3cLBrF8FHyftP0+gYxRk WnCdO5xSA9acNPnaEXFmj1tCserZM9BuMsFKYl7VMjdoxdlI8qFnSqcxd/4GzzYr4rqq DnyrmIWwFBFw2pJyGlYFkfG2iwkZSmnBYHZS+bwPP2PxZY5RDoaWbbWd4X+xlNze1A1V 5wMA== 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=7GnKtsbSjQET99vYRPaqlKo8Hvy4D9uW+T4E5gR3BOY=; b=TMUdSuF/ZM9NFCbKXAYGsZnoD47kGGLi7wJBmT5Sw0Fp34TETBThHe1zwBuoziudAL rmKSfK0FiM/7gp2wQOXyzXkA333+vLnsiXk/MLw0G6JwikOatc6mSQbVv46euq5K8dmX hDYFKOm9Nu/MC6wSFjhY9qQayjdQjfHA6b/PeC7DM/T1cSDcFw0qzhAy7QptYT/JHP6p Lmw7rDHZfttVamBXhjdEIapJB5d4Y+LPYsSjUX1FIWoButEM8kAkDqhrC/rSFeOvoaAl nRK5il8dW9ZNkYhr8gypnhrQ3YKDjyrrOEU3HXbQj7AVf5JDro+U7EzX0yZ5iQR3DkkP ucEw== X-Gm-Message-State: APjAAAVkLLTMAr+uF6sjRjOGWt9JrfGn+vsH6rqpIA2hSRfnK8hk/5iT VXUjRgxWY1+m3IFdDG4BnD5ZS3Ced8GsZZP+rUrrUogR X-Google-Smtp-Source: APXvYqyu7FZ+eQBiUA/NUL3TaFK2MWEJeXtNDaNmuRg0qy4UhriFZaEPq9YIYBUVi4vYvH9sbBZs/6Vv7uap6cB/vSk= X-Received: by 2002:a05:620a:6af:: with SMTP id i15mr6093453qkh.380.1569939726481; Tue, 01 Oct 2019 07:22:06 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Tue, 1 Oct 2019 08:21:55 -0600 Message-ID: Subject: Re: Service disruption: git converter currently down To: Ryan Stone Cc: Ed Maste , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= X-Rspamd-Queue-Id: 46jM0c3dHfz3QQ5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=NitAevDp; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::d31) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.12 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[1.3.d.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.12)[ip: (-5.82), ipnet: 2607:f8b0::/32(-2.58), asn: 15169(-2.16), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 01 Oct 2019 14:22:09 -0000 On Mon, Sep 30, 2019 at 1:17 PM Ryan Stone wrote: > On Thu, Sep 26, 2019 at 10:27 AM Ed Maste wrote: > > If you try this in a tree with changes (i.e., try applying it to a > > long-running merge-based branch) every modified file will result in a > > conflict, but they can be trivially resolved in favour of the first > > version. From that point on merging from the "new" conversion will > > work as expected. > > You don't have to do this manually. "git merge -s ours > origin/svn_head" will record a merge but will not make any changes to > the local tree. > I'm confused by this. origin/svn_head points to the tip of svn_head upstream. This is likely different than the last merge point of ours, so I'm unclear how this wouldn't bring in extra changes (or blindly say that those revisions had already been merged). You need to merge in the origin/newhash tree at the same svn revision as the current tree to do a zero-change merge. As such, you'd need some automation around this. i've run afoul of this sort of thing in other projects, and want to make sure that the issues there don't apply here. I'll see if this actually works by pushing one of my git svn trees that has the different hashes to github and trying to merge our work tree to that instead of the current FreeBSD upstream. Warner