From owner-freebsd-arch@freebsd.org Mon Aug 27 05:18:46 2018 Return-Path: Delivered-To: freebsd-arch@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 1AC29108CA67 for ; Mon, 27 Aug 2018 05:18:46 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw1-xc2a.google.com (mail-yw1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) (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 A6C9C7E4EF for ; Mon, 27 Aug 2018 05:18:45 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw1-xc2a.google.com with SMTP id y134-v6so5159421ywg.1 for ; Sun, 26 Aug 2018 22:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nC7NWQewL6goJCfdM0fl6Q+iEe1+X+mOGLDNw5bP4tA=; b=Jm6P5gsEGd6b9I9PEGfzesvT4oVYxfSlJcGkgHgm8SSNvrKluY+yEZOObEW79WGNIt 6m05CAWEcX+WBsl3WkQ6K2b1f/xDk6vHdSPpryEu8PVhLDJlR6IeW3Zh7jUSvJBVn7c5 vJ/BhYXIRvEZDlSVp518PjTQilTUMkfYzmxmg= 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=nC7NWQewL6goJCfdM0fl6Q+iEe1+X+mOGLDNw5bP4tA=; b=n2vIClX/idwsrC+AWm8x/Y5jRkUPoGg5MJLVsH2FDilj6YAkRaKI60Ux7CckU6Ev1O GVl6o4muW5UnshfQWpcx8IrGqfqNTmXeUiw+8FzQjb6/jv5O6DIfmLoKUHYERVNt8Dh5 fWKqtVCAI19/GEWnUKFjQA/WfjFBU5UGLYlK/9sZGXHCzmNgkq2zJF7olMg79PCT8u8g gMidNOlFKSbqXn7qsPOKFM+3OGel30bApRyte01DlHZ18FTj1T1B3GICG9UbMF/gDQKa Cd5gHLOBsK3Edc+Lw6MZRLbLLLalhgjvUeSkhPBWmMsSKwdptNkiPJTPQTCkviZhOY34 PvSA== X-Gm-Message-State: APzg51DTePg25SIj9eUukYWhqfEtkL//hP9/ZHjhGx/qJa5iEsK+hXcP 8M+G3GNZ+2AFhtCU/qKHQCRfKwPj5jx+prmPM/xA1RGY9ac2ZA== X-Google-Smtp-Source: ANB0VdYd9EHtzuGOijdtB1n7r8NnoOIdTcBLc4CcVjaUSraC0Q7MrRJoJSSs/8YTFIqkqkKbmmc3QAWlkMvlTTDJvNM= X-Received: by 2002:a81:3796:: with SMTP id e144-v6mr6135970ywa.213.1535347124688; Sun, 26 Aug 2018 22:18:44 -0700 (PDT) MIME-Version: 1.0 References: <20a85a8f-29a7-0d8f-64d1-9ba005ffe79c@FreeBSD.org> <10e35d23-37d8-edf4-fa3b-9663bfdaa629@FreeBSD.org> <7C8DB02A-8C15-4917-A941-A10DD2F3AB50@trouble.is> <8B61C2A5-DCEC-403A-B8F3-0B5BEF958612@freebsd.org> <20180812233252.GD30769@rincewind.trouble.is> <73a079ff-6bfd-150f-c67f-05f0f67b9aa0@FreeBSD.org> In-Reply-To: <73a079ff-6bfd-150f-c67f-05f0f67b9aa0@FreeBSD.org> From: Eitan Adler Date: Sun, 26 Aug 2018 22:18:18 -0700 Message-ID: Subject: Re: upstream for contrib/tzcode/stdtme? To: John Baldwin Cc: "freebsd-arch@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 05:18:46 -0000 On Tue, 21 Aug 2018 at 02:13, John Baldwin wrote: > > This will leave contrib with the old code and vendor with the new code > > and mergeinfo claiming we're fully merged. Is that the state of > > affairs that we want? I don't know subversion well enough to > > formulate a better plan. > > Can't you import the "current" version of tzcode into the vendor area > (what we have now) and then diff against that once it is moved to see > what local diffs we have that we still need vs don't need, then separately > update the vendor area to the latest version and do a "normal" merge? I looked into this before importing the latest version. As far as I could, the last time that tzcode was MFVed was in r200832 | edwin | 2009-12-22 11:17:10 +0000 (Tue, 22 Dec 2009) | 10 lines MFV of tzdata2009t, r200831 There were some changes here: r214411 | edwin | 2010-10-27 07:14:46 +0000 (Wed, 27 Oct 2010) | 32 lines Sync code with tzcode2010m tzcode was tagged at tzcode2010n but I don't see it imported. When I compared tzcode2010m against what is presently in head I got a large, although not incomprehensible, diff. That said, its similar in size to the diff against the most recent version. Much of the changes arise from the xlocale changes from 2011. -- Eitan Adler