From owner-freebsd-current@freebsd.org Fri Sep 7 01:02:32 2018 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C4E2FEB9A8 for ; Fri, 7 Sep 2018 01:02:32 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D77EA74233; Fri, 7 Sep 2018 01:02:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-xd36.google.com with SMTP id y10-v6so296569ioa.10; Thu, 06 Sep 2018 18:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=jCe2QSzMmAzmea/2W+oZp7SlWK9hwL6M8A7zUKhgC4k=; b=TXUYsPUWx8DnkXND/wguzz45HKIBarhqZHPTRtbYRBOkDrg8x1kCLCnyBRMU89zOj6 evd4MajC4Pi3QktRyMcUzy3HetYQnkBspFekmXNzvedYgeP7HrxtRc+RHPaHgbjMYMTu +PFkDXGK9rLYyoBW/Wnf1Da5wIxN9YmQiTzla7V8CCKJxaweklsboM5g6SrH8nnoclaB OA699oKrVo38LtzB6FhpwztLxzfAGUsx2Abt6Ljnd3E/oRWSiPtrl50BuOJA0cCDnquq sgcZAHq3UzJB3M70HmImw3Fixd0MCfvWyW78X98On1Nv/YfKtu2dlNPoXcMW+NiF0Sfa DmzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=jCe2QSzMmAzmea/2W+oZp7SlWK9hwL6M8A7zUKhgC4k=; b=jOvdfIsClHQaV/0Ad9kf3rWnL+CCeL4+MlOCF2X8U3LZM9BjY6VaosUUkYp8sSIEa/ k2b9FwvYYYt7OuLkq8JR8+k3Omle/byAp0oDVFThBf61erSIjz86kk33gRJ4Scg8JW61 sZhhQiftPATjkj2gelz7fXAdl2eTRPcGWPklWvgRs7X9R9MSKMbw0hMmg999nr7yxm/M FZCD32iCgI/oJrh9LLvoXiTZiQI+i5+3tVqKPs1VW4AKdL8T4yHLRcRqt6Z+mjYnl9Xb GBQSGdyTGb45Vzwkmh1tsK7+abf5MSEnJUF8HsWR1oMNy7T9TMwZiNw5Xe9H/y6qcJTJ 35ZA== X-Gm-Message-State: APzg51CtcrSZ+DxPUIAN35dZiL/sWyfIM2PESG4r3YYwn/7ZNaMUljME uHAbMDW3i+H18b4PA4ubBe8wwQeHeIQtMbcK6prliw== X-Google-Smtp-Source: ANB0VdbJZMLU6WLUBZY/qOI7nSujsUQzaHOqXW8L0bOcrKnq7/6OgLYXojR2EtIFfZv+LEoGj/RCWXpusy+zzVBLOJI= X-Received: by 2002:a6b:e716:: with SMTP id b22-v6mr4361431ioh.239.1536282151233; Thu, 06 Sep 2018 18:02:31 -0700 (PDT) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 2002:a6b:b603:0:0:0:0:0 with HTTP; Thu, 6 Sep 2018 18:02:10 -0700 (PDT) In-Reply-To: References: <18a5abcc-afbc-41c3-75ed-e33607e70c8f@zyxst.net> <20180904105302.GD2118@home.opsec.eu> From: Ed Maste Date: Thu, 6 Sep 2018 21:02:10 -0400 X-Google-Sender-Auth: y6tHM1XedmUuZRZ_U2hiwf5kT7s Message-ID: Subject: Re: github freebsd and svn freebsd To: Warner Losh Cc: FreeBSD Current , tech-lists , Kurt Jaeger Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2018 01:02:32 -0000 On 6 September 2018 at 20:11, Warner Losh wrote: > >> Assuming we're confident the issue in the svn mirroring process is >> fixed and will not recur we can redo the conversion, with a one-time >> change to all hashes from the offending commit on, and they would not >> change again in the future. > > What is the upgrade story for current users? How do they cut over? We need a > how to or something in the handbook. Yes, we'd need to have a fully documented migration process, and we should be able to have both 'old' and 'new' branches exist in parallel for some time. One way we could handle the mechanics of the migration itself is: * Create an alias for the current master branch - say, master-gen1 * Continue running the existing conversion * Start running a fixed svn-git conversion which pushes to master-gen2 * Document the process for migrating downstream work from one to the other * Switch master to master-gen2 * Deprecate master-gen1 after a suitable period Because of the way git works the additional branch would result in only a nominal increase in repository size.