From owner-freebsd-arch@freebsd.org Sun Aug 12 12:23:51 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 9F833106EE99 for ; Sun, 12 Aug 2018 12:23:51 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw1-xc36.google.com (mail-yw1-xc36.google.com [IPv6:2607:f8b0:4864:20::c36]) (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 35B7385A7A for ; Sun, 12 Aug 2018 12:23:51 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw1-xc36.google.com with SMTP id c135-v6so11768086ywa.0 for ; Sun, 12 Aug 2018 05:23:51 -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=uocs9NXIRWIvsqf8R3GGnNigQitl2hZQ2xOPQ0pVPRg=; b=ZwCzlfU3gmDw3d8wp9v3hqKep6pc9hBTVoLVEj+3Mqfo4sJg1YUiYLoLd3s4hPqod9 iZD8ALEvK9YRqIN/gCjUVx+1nRDPZ3IPgsJKbRJ/S5c9biLn3fckVdGlWd5VeYRHzuTu n9/5iJNwDSExlDw9Q0+EAIm8F+P7FNi9oIIAk= 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=uocs9NXIRWIvsqf8R3GGnNigQitl2hZQ2xOPQ0pVPRg=; b=EjqX3YypXYoQsaIeroUFzrx03u/9QLl7vrMCo+EzBOZeM7hVH9s8J0PQhHauKBNNu8 FNvQw5IjVW0wtky5jPndL9DtwctToSaP6iw/XusMH+Vf1s4GBs5LfI3UINuOco9kSUx/ hn5nxf+jFnG92vD7TorqBd8qCaHhEGCBQYPKRlaKN5UjH8neW0A+O2nqVWyLvxPZe1ZO QpBq1M/ON22fV9SYw1eSrXvjuv2ojx8igsjEiSW819qxeCORrV6YM2wCFvD7EX0+IBcX QXxcoXTusU90h2SlskKq8lL6RnnnF0xLu4PUndsl05Zf86n0HxUaBEccwh1MBc3Yxg1Q Qw8Q== X-Gm-Message-State: AOUpUlFL7LsIng3/fK7VuvkNzStQw5zpCfimWKLi5BhBLIZAiZlZBkQT mmgAcrsOZls63Sp935Hz9DAxncnvyA6uqz9+AexzNuMWQ/1dDg== X-Google-Smtp-Source: AA+uWPwg8Jxn5AZcVQVpN/ZMl1VF090Wnzi8D+YjSZ9+bXhRjzNKlpyrguPLQ8JIP293cvZXX61xRLqpN8/4IHR9r98= X-Received: by 2002:a25:22c1:: with SMTP id i184-v6mr7084293ybi.479.1534076629966; Sun, 12 Aug 2018 05:23:49 -0700 (PDT) MIME-Version: 1.0 References: <20a85a8f-29a7-0d8f-64d1-9ba005ffe79c@FreeBSD.org> <10e35d23-37d8-edf4-fa3b-9663bfdaa629@FreeBSD.org> In-Reply-To: <10e35d23-37d8-edf4-fa3b-9663bfdaa629@FreeBSD.org> From: Eitan Adler Date: Sun, 12 Aug 2018 05:23:23 -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: Sun, 12 Aug 2018 12:23:51 -0000 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. 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? -- Eitan Adler