From owner-freebsd-arch@freebsd.org Sun Aug 12 22:09:17 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 E0D45105521A for ; Sun, 12 Aug 2018 22:09:16 +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 82DFE7C37B for ; Sun, 12 Aug 2018 22:09:16 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw1-xc2a.google.com with SMTP id j68-v6so12322498ywg.1 for ; Sun, 12 Aug 2018 15:09:16 -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=1p+D2475yMXcEdnDJNLSST8WwoWwE2nSD7TbzOFGN9Y=; b=amBRLO/yh1xsRJNJ2TbliX0hFGWy7RUNRVmXrl+UtKo8Lft2TvwSYzuTOoi9VvDutY 4bSgm6pjuFuxebVr9yOVejz/iAotkeXgmnqYhTPK3CBFVLdOkKBfZv/1q5SVfnqjv6r4 0i43z7okEufGzH/W3Dwo/MfS/ypi1VcZDXTa0= 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=1p+D2475yMXcEdnDJNLSST8WwoWwE2nSD7TbzOFGN9Y=; b=KnFk0Bz5SV9ghtM5+HyGoPts0xwrl6HICnSZMurslBBLeq7zwwFgM/IndSZrgjoW8f cRj9TdF6GX5BNHuIDQVgsi5bifCCcX4D8ShyQvVW38jWRhaZpDUvCYVWS3cLRE03wQNl dzTdMSwTZu+g6JkRDCO7z/3J6DWZFqFsbuiAxXmxSinU9XOKNYllyP5UC7MdMjXcV9uv V10yemE02m791egd/f4iMHuuoghfv/urg0E6/cSDy5Db7sY4+6d3/RbvPtjuAFG+mg7Y xyEuLWjZm8zfv0vSYKkyoeMxszvr40IpQMkHLqWUeMH/sy2K6cRKWuHMC06N1+vcPE6T K7Hw== X-Gm-Message-State: AOUpUlEmknyyj/Ixtb1TaZoUx5RZ4G1u/JkGuD1NVuiAzeYtdZIvdjfe E64ZWwd+b2hSVJJ+XZzBedpLZbRhpEUCEhZ5FCHwcA== X-Google-Smtp-Source: AA+uWPxp/7+AM7Yk1Pau15Gw+f7d83vZlIB7Sw+dQ9KTSPJRbuXGdF59PHB/HPp1OkPKEvPWO8+9onQsrNMQ1mBVtUY= X-Received: by 2002:a0d:f843:: with SMTP id i64-v6mr7730758ywf.182.1534111755762; Sun, 12 Aug 2018 15:09:15 -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> In-Reply-To: <8B61C2A5-DCEC-403A-B8F3-0B5BEF958612@freebsd.org> From: Eitan Adler Date: Sun, 12 Aug 2018 15:09:00 -0700 Message-ID: Subject: Re: upstream for contrib/tzcode/stdtme? To: Philip Paeps Cc: John Baldwin , "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: Sun, 12 Aug 2018 22:09:17 -0000 On Sun, 12 Aug 2018 at 06:00, Philip Paeps wrote: > > On 2018-08-12 20:36:23 (+0800), Philip Paeps wrote: > > > On 2018-08-12 20:23:23 (+0800), Eitan Adler wrote: > > > >> On Mon, 18 Jun 2018 at 10:08, John Baldwin wrote: > >>> > >>> On 6/15/18 4:09 PM, Eitan Adler wrote: > >>>> On 15 June 2018 at 11:31, John Baldwin wrote: > >>>> > >>>>> I think this second approach is actually a better plan and is not > >>>>> quite what you > >>>>> were suggesting. > >>>>> > >>>>> That is, import the vendor bits corresponding to our existing code > >>>>> first into > >>>>> the vendor area, > >>>> > >>>>> then svn cp our existing files from libc, zic, etc. into the > >>>>> contrib/stdtime tree in the correct layout and do a single 'svn > >>>>> merge --record-only' > >>>>> merge to initialize the vendor mergeinfo. > >>>>> At that point you should be able to > >>>>> svn diff contrib/stdtime against the vendor/stdtime/dist to > >>>>> determine what local > >>>>> changes we have and start to think about them. > >> > >> Coming back to this. In r337683 and r337684 I imported a recent copy > >> of of TZDB. I was unable to find a copy of the 2010n distribution in > >> the original layout. > > > > That's because we split up the tzcode in our vendor area (for reasons > > I've never understood). As far as I know, there is no 1:1 mapping > > from any tzcode distribution to what we have in our repository. > > > >> The next step, if I understand, is to do the following: > >> cd /srv/srv/freebsd/svn/head/contrib > >> mkdir tzdb > >> cd tzdb > >> svn cp ../tzcode/stdtime/* . > >> svn cp ../tzcode/zic/* . > >> svn cp ../tzdata/* . > >> svn ci > >> (the above ignores duplicated files, but that's just expanding the > >> wildcards appropriately). > >> > >> After that: > >> svn merge --record-only '^/vendor/tzdb' . > >> > >> At this point we'll be able to diff contrib/tzdb and vendor/tzdb to > >> show the most current vendor code compared our, modified old code. > >> > >> Is this correct? Is this the optimal plan? ... > please import tzcode separately and leave tzdata alone. Done in r337693 and r337694. The next step, if I understand, is to do the following: cd /srv/srv/freebsd/svn/head/contrib mkdir tzdb cd tzdb svn cp ../tzcode/stdtime/* . svn cp ../tzcode/zic/* . svn ci (the above ignores duplicated files, but that's just expanding the wildcards appropriately). After that: svn merge --record-only '^/vendor/tzdb' . At this point we'll be able to diff contrib/tzdb and vendor/tzdb to show the most current vendor code compared our, modified old code. Is this correct? Is this the optimal plan? -- Eitan Adler