From owner-freebsd-git@freebsd.org Thu Oct 10 20:03:55 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 BEFCA1306FB for ; Thu, 10 Oct 2019 20:03:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 46q28p2Lbmz4WP7 for ; Thu, 10 Oct 2019 20:03:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x735.google.com with SMTP id q203so6811956qke.1 for ; Thu, 10 Oct 2019 13:03:53 -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=QLWpGXiKWvlKDZg0H9j9mjOYmR9zoqhAXrwkDeKU+wk=; b=We7LcIrPb5bGtC/NHsiGn0qb1cZ4yKuNalzO1PqIHLfBvwTLXGbfJYl71RERMTIaGp 5m8WZhRbSi0i51eUx3eX6SSMoR8HpFOWxz1XNpC7EnMuokHF3ESteWgQjwUzNfCZS49f DlKt90BYLs/W7yxyPCK626LCZ3vHNLbax9EuuVNZxAr3amm35rx4A/x6E9EOzP7cnJdV 3XTo+MBRGNuEWQrrpUMuqLA8bj8VbGf8sBenFp1yt7p3+lSZ90ZBHjOQesak1Nl1tSlQ nRFJUgzg4KjvsVJhpPA+yhiAqDvOPS8NCd9ewnkYwMKPePkxwCcqp20/TQ+lXHfz5D7s sEBQ== 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=QLWpGXiKWvlKDZg0H9j9mjOYmR9zoqhAXrwkDeKU+wk=; b=gLjE+1WnNIswAwneHlsjnff+HdpqJI/73Wj6cxxF8OKBjFrqpgSrqMXP4u4pfnYO38 MraxKF/4wbLdaIk10nVQvtn5H0Hdo2BUZepOKfYtRJiRkixFfdZZMrsCbTy2lm18XIA7 Ey/J0CzL3Fc7FUrQ/c4ZmPzbkQK8sjG+JarmIcR0qVcbHd+j9aEMlCalLZCPqaLEQY7p C8iobRRVi/aWwfVoQ9+TO88+aQgzY2dObrwbnJY8dZIWvUhSUcC/fJ8+VSwYQzwcPhy2 iAo2ZRFq8nrDp2cbc7QwCEJCL/rL5C107PImINE6twWF0yG5h1DZoOPYfnssbqta2JnV 5lsw== X-Gm-Message-State: APjAAAX0EQbmq4vdTdBYOVd1VEKoOyOY3bsM3x8eeatFYkO6cL56lYEV b/jgubvd7Xy8sy6iOZKxv2lIeQcykioN4jLmHee1jg== X-Google-Smtp-Source: APXvYqyH/lUSe/1I43Cif1GhW9+OJMYwxy3sd8uLQl4HgYR03P2+TMfQhL2VRZXirAg0b3G2DziJVu5XmZKwrMagnks= X-Received: by 2002:a05:620a:a8e:: with SMTP id v14mr12063532qkg.215.1570737832626; Thu, 10 Oct 2019 13:03:52 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Thu, 10 Oct 2019 14:03:41 -0600 Message-ID: Subject: Re: Service disruption: git converter currently down To: Ed Maste Cc: Ryan Stone , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= X-Rspamd-Queue-Id: 46q28p2Lbmz4WP7 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=We7LcIrP; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::735) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.82 / 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]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[5.3.7.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]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.82)[ip: (-9.39), ipnet: 2607:f8b0::/32(-2.53), asn: 15169(-2.13), 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)[]; FREEMAIL_CC(0.00)[gmail.com] 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: Thu, 10 Oct 2019 20:03:55 -0000 Just FYI: netflix% git subtree -P FreeBSD merge bsdimp-zooty-svn/meta-bump fatal: refusing to merge unrelated histories netflix%git subtree -P FreeBSD merge --allow-unrelated-histories bsdimp-zooty-svn/meta-bump error: unknown option `allow-unrelated-histories' ... bsdimp-zooty-svn is a tree that I've been maintaining via git svn. So the hashes are different, even though the deltas are the same. I've not tried a simple 'git merge' yet. It does support --allow-unrelated-histories, but doesn't support the subtree stuff Netflix needs. Needless to say, this is not a happy thing... Warner On Tue, Oct 1, 2019 at 10:51 AM Ed Maste wrote: > On Tue, 1 Oct 2019 at 10:32, Warner Losh wrote: > > > > I'm pretty sure you'd need to merge to the same svn rev in the new-hash > branch as your last merge point, though. I need to test that, though. > Usually a merge is to the top of the thing you are merging, so some caution > is needed. And all the -s does is accept all our 'conflicts'.... > > Yes, I've been assuming (and my experiments have been) with an > up-to-date origin/master already merged into my working tree, and an > up-to-date svn_head that exactly matches origin/master. > > There are a few different ways this could be done in a > non-experimental situation, and we should experiment with various ones > before anything is finalized. > > >> git rebase --onto origin/svn_head origin/master > > > > kinda. It would rebase the current branch onto the new tip of svn_head, > not the current branch point. This isn't quite what you want in many cases > because it will pull in new changes. The --onto arg needs to be the same > svn rev in the new-stream as the current common ancestor of the current > branch and origin/master. > > Indeed - in my experiments they are one and the same - there are no > new changes in origin/master that are not yet in my working tree. > > I guess the rule of thumb should be that work to address changed > upstream hashes should not involve any new changes, and thus cannot > have any conflicts. In my experiments that's most easily achieved by > starting with everything up-to-date. > > > So for a single tree, with a single branch, I'll grant trivial. I have 3 > or 4 trees now with a total of about 100 branches in various stages of > WIPness. For that, it's not at all trivial because maybe 10 of the WIP > trees haven't been merged forward in a while due to conflicts that I've not > had time to resolve. > > I'll grant you even a trivial action multiplied by 100 could extend to > a reasonable effort :) > > However, in any scenario you're going to have significant effort to > deal with those 10 WIP trees. If we published both "old" and "new" > versions of the conversion for some reasonable period you can choose > when you spend the time to update those trees, and then perform the > (individually) trivial migration to the new view. >