From owner-freebsd-git@freebsd.org Wed Apr 8 16:06:09 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E62B2B5830 for ; Wed, 8 Apr 2020 16:06:09 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48y8Jx2C3Sz4Kp7 for ; Wed, 8 Apr 2020 16:06:09 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 4B7F02B582F; Wed, 8 Apr 2020 16:06:09 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B4692B582E for ; Wed, 8 Apr 2020 16:06:09 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48y8Jw3dngz4Kp6; Wed, 8 Apr 2020 16:06:08 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f175.google.com with SMTP id t6so7217163ilj.8; Wed, 08 Apr 2020 09:06:08 -0700 (PDT) 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:content-transfer-encoding; bh=LUA+mTMWEKlKKVAgN4Q3Eo6J0hwOMUsDt3V7r3L/xHM=; b=pYREgbpabiwVJZdTAhmaLqYMKGJDqPRdnmMi7rryCHwmn1p+6mZ8GbqAH9RH9WQhbH GK45IMyZpfv43M3MGHIuCD1g0YhJghqBdqd02MhvOpstyM86duUhpr1Div25egvXFSbz Q4dxy/HBMiqsVkbMzR3Ei93wHpLvNMU4FQD6zfkODbqGwtACJbE0ZBY8yIwvkl5lzjjc pNvpIxzBRC87iesETr43Gamju6n8VzV6obnvK+YvRrCQEJ0ZJU0Kl2k7+wRx7AzrVd6M GYfC/u3LYjNxEfig9lo8CcGSC8K08KdJQ4CAlxLGmo7ECzXsT1BFeQFYd0M2UNbcSXaM 15Lg== X-Gm-Message-State: AGi0PuZQG0XHC3jX873XvtxL1pYxs6KbOvCuGPemQ48y6op0jXAbEshe qBx/KbAUOVDmjpl7EoA0hIJzY++WMwdLHS3Ux0CohrRQ X-Google-Smtp-Source: APiQypJYBZyNTdBBbm+EsrBVQSgd/ww51BqEqrGh/nVvw0LAYTQOK6vLrZa1QzcazeSqDlth8KxsbQIVn5SCcWC+Vz8= X-Received: by 2002:a92:41c7:: with SMTP id o190mr8367812ila.11.1586361965368; Wed, 08 Apr 2020 09:06:05 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 8 Apr 2020 12:05:53 -0400 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48y8Jw3dngz4Kp6 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.175 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.08 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; SH_EMAIL_ZRD(0.00)[0.5.39.145]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; SH_EMAIL_DBL_DONT_QUERY_IPS(0.00)[0.5.39.145]; RCVD_IN_DNSWL_NONE(0.00)[175.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.08)[ip: (-4.55), ipnet: 209.85.128.0/17(-0.40), asn: 15169(-0.43), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[175.166.85.209.rep.mailspike.net : 127.0.0.17]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2020 16:06:09 -0000 On Mon, 6 Apr 2020 at 16:24, Ulrich Sp=C3=B6rlein wrote: > > Can folks help out a bit on how merginfo is stored and whether it is > actually stored on the revisions? > > svn propget svn:mergeinfo -r337810 is not very useful output (and > doesn't say anything about /vendor/lua !) Ah, that's showing just the mergeinfo stored at the top of the tree. propget on the contrib dir shows the appropriate mergeinfo: ``` $ svn propget svn:mergeinfo -r337810 contrib/lua /vendor/lua/dist:326353-337809 ``` however this still isn't particularly useful for inferring the merge-from rev in a git revision because 337809 represents the repository revision at the time the merge was done, but we really care about the last revision in /vendor/lua/dist at the time of that merge. I think this is the appropriate merge-from revision: ``` $ svn log -l 1 ^/vendor/lua/dist@337809 ------------------------------------------------------------------------ r337586 | kevans | 2018-08-10 16:05:41 -0400 (Fri, 10 Aug 2018) | 2 lines Import lua 5.3.5 ```