From owner-freebsd-git@freebsd.org Tue Oct 1 16:51:05 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 B71FD13AB93 for ; Tue, 1 Oct 2019 16:51:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (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 46jQJS600jz44T0 for ; Tue, 1 Oct 2019 16:51:04 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f54.google.com with SMTP id c6so49586463ioo.13 for ; Tue, 01 Oct 2019 09:51:04 -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:content-transfer-encoding; bh=LtZu2UB9FuZwTHXxswrqUXhLVoMWwEFUDywcovj0ZCw=; b=PqajpRCOtBV8v+a71VTwlCCn9HSLIX2lYLYlixT/bOdKx2sqxzSl37b9bfi19Mq1n3 XQ5m3Zablnz1ilOIllEGLsf4cwj3t+TYcOEvBkLG+G8zclEB5VzgeILqt1+htdh6GeBw bBolTVkfUkuSLstRsZ3j86Ikw5QAo9GuCVpg+wbrWQzEO3UOh/irktB+c9rtwkvjaDkS ZwafK0wiot7bHJP2uOtNYl0nYS1EmCuQ45Sre+qDSTERoHF+N+uwXq6H09v33tBd2Djf liLIOsE63NwWDBGcXsmG+krWzC1Xhl8I1RUW6fwW3Vp47tkrfl5JzLanfcLvX7UluPaL /DLA== X-Gm-Message-State: APjAAAXHeF4yIv7S/K/DTaAW3rBmlbKRVhW9xWqHDI7GiigokE0s+WXY H5I3Qp3bDAV/rHuk6ttRm/CfFj55C8bGJhGYtnM= X-Google-Smtp-Source: APXvYqwNmPcE77FUAKuPMn/xYeOvaKGH8qanFTcGGSxMCD3O5NQwhUf7lEg81zKDgsJQDExSbywWUjeteKCN3CVFfeo= X-Received: by 2002:a92:995a:: with SMTP id p87mr27134452ili.115.1569948663143; Tue, 01 Oct 2019 09:51:03 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Tue, 1 Oct 2019 12:50:50 -0400 Message-ID: Subject: Re: Service disruption: git converter currently down To: Warner Losh Cc: Ryan Stone , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 46jQJS600jz44T0 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.54 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-4.23 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[54.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-2.23)[ip: (-5.65), ipnet: 209.85.128.0/17(-3.28), asn: 15169(-2.16), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[54.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_CC(0.00)[gmail.com] 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 16:51:05 -0000 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 b= ranch as your last merge point, though. I need to test that, though. Usuall= y a merge is to the top of the thing you are merging, so some caution is ne= eded. 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, n= ot the current branch point. This isn't quite what you want in many cases b= ecause 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 WIPn= ess. For that, it's not at all trivial because maybe 10 of the WIP trees ha= ven't been merged forward in a while due to conflicts that I've not had tim= e 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.