From owner-freebsd-arch@freebsd.org Fri Jun 15 23:09:48 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 7B4F5101FF0B for ; Fri, 15 Jun 2018 23:09:48 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x22d.google.com (mail-yw0-x22d.google.com [IPv6:2607:f8b0:4002:c05::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1606987A21 for ; Fri, 15 Jun 2018 23:09:48 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x22d.google.com with SMTP id u124-v6so3893337ywg.0 for ; Fri, 15 Jun 2018 16:09:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=HcasK9lk3rRbJDdt6+TzV98s/01PFVDM0G21Gsu/JDk=; b=iHShr2IpSYxh4Mg5odZp6BD/yd91GeovRaNIvXwlo7Q+Y0bKru3+cXoMcYPKmU+SLS 3L1JD0qFJZJ4ce+3If1QDW1ALV30nYRa8rbHQQ5BO/dbo8Xgn8tx4+5DlH5xxrbzK4/A wxZrrNVS8/Q72WbZef5Kimr+1OwVQd09juBMk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=HcasK9lk3rRbJDdt6+TzV98s/01PFVDM0G21Gsu/JDk=; b=EVk2VZAPHNQ7L+dc3z69oanMkHRCSVYWZJkAh6KDjn6ICyps/EhaxWRDS1hpeSsU17 3n2gD8scyGphX6IaGjCn/DL0vULed/5FTwwLJSW6/jYB2yLoYqEVQy+K6SNnWphX1ul3 DUDWdwXTdQskc2PuVEk94M7eKdgQHANd1P2/kUDo31NCVNxvuPc7D4/n3iSjAIHbmrn/ rN+Zp73hyTk4v3mE8KmluOajMzctd1pWWDsvH6ML4g32afYranQFwWG30Vupm8cc4682 4AQf94+TSb+mZT5Tr0Fr8mrs4S7Idmj3Q4HxubJyqk/ObgmL9XuaLJCHsaTlSa9Dgo6A OkbA== X-Gm-Message-State: APt69E2u3ISjkPd0ym1vNuttRP5dYYLRLb/QUieofR9NtQYx4cfsZmuI MUX/90+Ggfq9LTZK4ioI035NrlI2R6X7onPYcDPDAg== X-Google-Smtp-Source: ADUXVKIdkl+fu+82ioEBcDvxFcQXpEeVRsqwlMXgCuyI0q3VtL4NJaXDoXwxpT+wtvOcoOWDixGcQ+0ZxVqyO88P8/I= X-Received: by 2002:a81:af1d:: with SMTP id n29-v6mr1930385ywh.113.1529104187501; Fri, 15 Jun 2018 16:09:47 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:ef50:0:0:0:0:0 with HTTP; Fri, 15 Jun 2018 16:09:16 -0700 (PDT) In-Reply-To: <20a85a8f-29a7-0d8f-64d1-9ba005ffe79c@FreeBSD.org> References: <20a85a8f-29a7-0d8f-64d1-9ba005ffe79c@FreeBSD.org> From: Eitan Adler Date: Fri, 15 Jun 2018 16:09:16 -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.26 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 23:09:48 -0000 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. At this point both vendor and contrib have the same files, same layout, but possibly different content? How do we do the update itself then? "svn merge" from the vendor area into contrib? -- Eitan Adler