From owner-freebsd-git@freebsd.org Mon Apr 6 20:24:56 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 4851827AD7A for ; Mon, 6 Apr 2020 20:24:56 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48x28R73Xwz4YT6 for ; Mon, 6 Apr 2020 20:24:55 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id F22CB27AD79; Mon, 6 Apr 2020 20:24:55 +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 F1F5A27AD78 for ; Mon, 6 Apr 2020 20:24:55 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) (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 48x28Q3XmNz4YT5; Mon, 6 Apr 2020 20:24:54 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f51.google.com with SMTP id 22so791165otf.0; Mon, 06 Apr 2020 13:24:54 -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; bh=8dIx7yjz5XEdeOIIkILFRMnx6YgmdAhuldl8+7LBEG8=; b=PN5/yV026DbwiuEJolHC6xPzlFy5uNN17czprrieneer6ciD/Z1eH/+wW5jS8VAYxc OG/WnNtRCr1PjrY7Hr+7IUXEAcGgMLXKPs4MDki1Cm3vETvBr3TYx8xiKvb6NKjfgOOx qKa6Uz+r9hiFg9IgR9QSjXBaHz0KizOznUiHxzZE8HVYDxIcIozYmtAmkWPMHKhz7YNy vs+rDGANh76Mc69fD6N8b80KIHT9YMp9o9lhnB6iSw1aNxdkeR59sOfQXM3xG6la/WRw 2Fxd64O42JopuNDBzULKmnzT6IJ1QzxYKy591tlbsdsKxjgeUqM6RPIE7YeCUhhNdTTc zEsA== X-Gm-Message-State: AGi0PubNwXgXo3TjXRnLj4Evim9wKQNJpSdPQgSUQMDVczHu02S14phe zyiyyCAendtirR0drPylBaqNqXMvsHrsDEvQFp+vISDa X-Google-Smtp-Source: APiQypKzTXl5DC9+67wPHnuprUuw1bunsGNX5ymhtu3MaHgZx8exVJVSblOzrdCBHfInzWD+wi6fTgYTRMUvTYWKtl4= X-Received: by 2002:a9d:37c9:: with SMTP id x67mr18777902otb.207.1586204692688; Mon, 06 Apr 2020 13:24:52 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Mon, 6 Apr 2020 22:24:36 +0200 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48x28Q3XmNz4YT5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.51 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-2.49 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.991,0]; 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)[]; RWL_MAILSPIKE_GOOD(0.00)[51.210.85.209.rep.mailspike.net : 127.0.0.18]; RCVD_IN_DNSWL_NONE(0.00)[51.210.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.50)[ip: (-1.64), ipnet: 209.85.128.0/17(-0.40), asn: 15169(-0.43), country: US(-0.05)]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; 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)[uqs@freebsd.org,uspoerlein@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: Mon, 06 Apr 2020 20:24:56 -0000 Am Do., 2. Apr. 2020 um 21:35 Uhr schrieb Ed Maste : > On Thu, 2 Apr 2020 at 14:51, Kyle Evans wrote: > > I'm not sure I understand what's going on here... it's a merge commit > > that didn't have any new files or moved files. This is the exact > > result you get from svn merge -c from the vendor/ branch with just > > file modifications -- note the svn:mergeinfo. > > My working theory right now is that svn2git fails to detect merge > commits that only modify existing files and do not copy any new files. > I found a document[1] that svn2git should parse mergeinfo, but that's > in the context of a working / topic branch, not a vendor branch. That > document does point out that "grafts" can be used to retrofit the > history after the conversion, if we must. > > More investigation is needed. > > [1] https://web.archive.org/web/20190515003725/http://blog.agavi.org/post/16865375185/fixing-svn-merge-history-in-git-repositories Can folks help out a bit on how merginfo is stored and whether it is actually stored on the revisions? svn prophet svn:mergeinfo -r337810 is not very useful output (and doesn't say anything about /vendor/lua !) I haven't fully read through http://subversion.apache.org/docs//api/1.11/svn__mergeinfo_8h_source.html but it talks about mergeinfo being on paths (which is also my faint recollection) Cheers Uli 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 ``` From owner-freebsd-git@freebsd.org Wed Apr 8 18:23:47 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 1E5B927895C for ; Wed, 8 Apr 2020 18:23:47 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48yCMk5vrMz4TZc for ; Wed, 8 Apr 2020 18:23:46 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id CAC7B27895B; Wed, 8 Apr 2020 18:23:46 +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 CA83327895A for ; Wed, 8 Apr 2020 18:23:46 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (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 48yCMk0nQ2z4TZb; Wed, 8 Apr 2020 18:23:45 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-qt1-x841.google.com with SMTP id x2so687799qtr.0; Wed, 08 Apr 2020 11:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DdebmXYpoIISIbZY6/NHSPYQb6e4KcHpO+kmTu1bnOk=; b=jOSDRvwEVl8yvNv2ZxbqUoQB8chLoG5lZ3aMnUk52QpFXv1fbcmDDTKzAqdN8cBA+u WsucHZ5qPYDLkW+deImRO44XM2WXp9w5utClCgYRGWpYqxhef58oooNfOpV2kdNjwmoB kTvELsVuUGNBP+Yiorg7HK9hW2PUnvBylLGST6URnqULmwAMHZcwaabpiZFeW2xLSMox oSts7hE712nt2IWkbq7GfgwFkukVqDacb9Tha7yxKzN8PepRRYkR8BlWNpExzv9YL7y5 yJqceTUElyCSq+xJQ/IV3a7p9i8OYCttTkH4QsWfy7LU2MYIKW85LHk2Qxwq6+P+K2NA xHgw== 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=DdebmXYpoIISIbZY6/NHSPYQb6e4KcHpO+kmTu1bnOk=; b=DKECPwlGk3vCmuIqoujNXQQ/7rtF281jQ39zbHdgNjsuUZCjb3WY69JlUfzy1TRh12 ASyo4WuutS6CnMhCAorzTvKIPZvGQh8FEFDE2oD/c227m3wbwzfFFqa1k3R1JdoD4kue 7YW9DAJpJbxb8hnh8mbNw1oqPUpJgu5XoMeVkARUmMV2lTScqe86qFdCqR5YsuUv9kfG 2cbdiaaqHlzYHwFE6uF8EEgSWGHzbLhYVWrNLltg9M3gW7oU92TOA2nCBrMe9Xx+Z2Lq BFSd+iOHfScSbFotmCYuDbL4dB+DoGfao/dyr57ClzHIXY96l5I+CLpIeJDZmCQEZrbZ ssow== X-Gm-Message-State: AGi0PuaH1DMmOBqRhESRg0mqo+qwUCQmCvu6ndvdUyMRTfU7hTny6vjv kGskBJyywxoqQ6GcarJFpRPabpiTxP+C6qYOra/lVg== X-Google-Smtp-Source: APiQypI0AloV2cn0SOwTebSSq27bYbt+Mqse+KxNIh41rbrEIdekQSzV9+IEcuNvY+069hHBma6X/YJoKcInT/eEzs4= X-Received: by 2002:ac8:4a08:: with SMTP id x8mr928388qtq.353.1586370224929; Wed, 08 Apr 2020 11:23:44 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ryan Stone Date: Wed, 8 Apr 2020 14:23:33 -0400 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48yCMk0nQ2z4TZb X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=jOSDRvwE; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of rysto32@gmail.com designates 2607:f8b0:4864:20::841 as permitted sender) smtp.mailfrom=rysto32@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; IP_SCORE_FREEMAIL(0.00)[]; IP_SCORE(0.00)[ip: (0.03), ipnet: 2607:f8b0::/32(-0.33), asn: 15169(-0.43), country: US(-0.05)]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[1.4.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0] 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 18:23:47 -0000 On Thu, Apr 2, 2020 at 3:35 PM Ed Maste wrote: > > On Thu, 2 Apr 2020 at 14:51, Kyle Evans wrote: > > > > I'm not sure I understand what's going on here... it's a merge commit > > that didn't have any new files or moved files. This is the exact > > result you get from svn merge -c from the vendor/ branch with just > > file modifications -- note the svn:mergeinfo. > > My working theory right now is that svn2git fails to detect merge > commits that only modify existing files and do not copy any new files. I seem to recall a git converter bug fixed many years ago that would incorrectly record an MFC as a merge if and only if a new file was added to the destination branch, so I would not be surprised if you are correct about this. From owner-freebsd-git@freebsd.org Wed Apr 8 18:36:53 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 6CDA8278E6E for ; Wed, 8 Apr 2020 18:36:53 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48yCfr6vz4z4VW7 for ; Wed, 8 Apr 2020 18:36:52 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id EB2EB278E6D; Wed, 8 Apr 2020 18:36:52 +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 EAF15278E6C for ; Wed, 8 Apr 2020 18:36:52 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) (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 48yCfr0DzKz4VW6; Wed, 8 Apr 2020 18:36:51 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f193.google.com with SMTP id g15so7705691ilj.10; Wed, 08 Apr 2020 11:36:51 -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; bh=DdjSLqp3GOQzzgVP6XooENUHUysmSOsHjbio3F5E4fU=; b=S5rtO7EOBR3ZyrvHp2k0vorswD1fOcQr3MbdIxdnGyFu2MNU4Mh7+tsKXVbEYS3omK n3h+y9sU1qKzdtmoEa3ImCX2jNrBcXakYp9G0e6QYvrbJsPLWL1Jf6DIoRLhGQCaCLcz YVfHP9NRuHYF4OviLTim97mfR5we+TkuawhJV6h3EGmUdZ/2J+37brg/C8iZVYZvOrP0 fhIm5+FzxGy586wuCvECWb/t8629z0hXjg4eype7ckAMFCRIuUG4mcZZhht6eZaKVVFi /WXlVJWMz7v1pJuKapFJSKOpAWKu2jdizYd5y+jKLv8X8EQnjUOmSQwzO+ppmKq7vQu/ ja6w== X-Gm-Message-State: AGi0PuZoBXwvZiPLy0y8nWZRH987f/bCrF/H4PO1OlBGZh2YnMZuqOvo nW91tI68dbysvRA7rtoc4/2HoLHNxx1Ob0qdWbwSQA== X-Google-Smtp-Source: APiQypJS8lhYgEXHwHHSl2aUVv20XOZdGQl0zCYJoNbcOKabJyFtPAEETViOm/B58FnDalUl8Z6aaVLkLL0Ja4ce2Ig= X-Received: by 2002:a92:cb09:: with SMTP id s9mr1142028ilo.182.1586371010854; Wed, 08 Apr 2020 11:36:50 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 8 Apr 2020 14:36:38 -0400 Message-ID: Subject: Re: Strange commit To: Ryan Stone Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48yCfr0DzKz4VW6 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.193 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.16 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[193.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.17)[ip: (-0.00), 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]; FREEMAIL_TO(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[193.166.85.209.rep.mailspike.net : 127.0.0.17]; 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_TLS_ALL(0.00)[]; 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 18:36:53 -0000 On Wed, 8 Apr 2020 at 14:23, Ryan Stone wrote: > > I seem to recall a git converter bug fixed many years ago that would > incorrectly record an MFC as a merge if and only if a new file was > added to the destination branch, so I would not be surprised if you > are correct about this. By "a git converter" do you mean the converter behind the current https://github.com/freebsd/freebsd conversion, or some other converter? Because as far as I can tell now the svn2git we have just doesn't handle mergeinfo at all. From owner-freebsd-git@freebsd.org Wed Apr 8 19:00:00 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 3CD30279824 for ; Wed, 8 Apr 2020 19:00:00 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48yD9W5hkwz4X2C for ; Wed, 8 Apr 2020 18:59:59 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id C36BE279816; Wed, 8 Apr 2020 18:59:59 +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 C32F5279815 for ; Wed, 8 Apr 2020 18:59:59 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) (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 48yD9W4nbXz4X29; Wed, 8 Apr 2020 18:59:59 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-qt1-x844.google.com with SMTP id i3so760102qtv.8; Wed, 08 Apr 2020 11:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TkVilyrEOkKgsEnuYMiHZogWpOn8bPhp4gKGqaXd+PQ=; b=cNegBwx54vAhBzY/rDEgaXEdRzLQFTHUJnaKETUIXwfnuQGT6FETTMRvaQN6bR6owQ EX4zs1u1hRSCjAmchkbe6JZulS3v9xreRDu8tZZxe9PM2RcA+f4jbowXNnboAgp9GHnZ z/Dl7+KHX0hp+ZZnLJRYGrnCvf2xA0PDuBkqx48DRaPUXGTm5U1c7X1r4P2r73Wrv3U3 /COvT7yhCqX3pPQM5vKkiEh4AlzuT/1MAS9N5c2QdA3Dojs1e4ARtMhspRaprJOQ4WsB DIWWAtbnIJHARpgPe9MsLhp7uXNkksdXL12+Qzlq8F9Ej2Zz0QuxuwtleIOb9RN6n2Fh VZ9A== 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=TkVilyrEOkKgsEnuYMiHZogWpOn8bPhp4gKGqaXd+PQ=; b=LC8TqdpJWxFoSA1dRH3Txn6o7vAsCFV4bQUMxXxnJwgtBChh8Uav58LvBMSLjFn4t3 /5xnsrajVRq4O0fBS5LmqSL9YmB66AStl1mt6WPADfoaBWFX2t4AHlOc0p4aOLudcgM8 AILxejiNeORUm6NPOvj/Hy74xmLZtvoVAB6lWETYu6NGdkzT3zZyYcXakVnolQq6Umvp QBmfWAAHmPXSzz1yu8bkIwfu776BY+eGAVzVUENSAENzRgGTRLZmRGJ7T0Ek+4LhgVRE 9rkC2jMUGo7ZRz7cyc4CIQERRDp8MB6NHWZLKaH3Rg1YGUkywhr3gPOcLx5B03QuLbP3 zs0g== X-Gm-Message-State: AGi0PuZv01nSpcNjzOWpTPL7MxZSLv82fqrAgx4H5EvDvQ7PCpUCGPrJ zMoWGbnHgUXIMz17XePtty8ATz0qDRcYSeVWZAD/MA== X-Google-Smtp-Source: APiQypITMfeFjNkCe5uJkpM5AL5kYJupNUQhc7IgBJ4MLykoX6TEJGApwp6aA/RMC06z9w7XHaL+90V5LnT+QCbtJ64= X-Received: by 2002:ac8:4a08:: with SMTP id x8mr1093676qtq.353.1586372398551; Wed, 08 Apr 2020 11:59:58 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ryan Stone Date: Wed, 8 Apr 2020 14:59:47 -0400 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48yD9W4nbXz4X29 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] 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 19:00:00 -0000 The converter behind the current tree on github (or rather, checking my email, whatever uqs was running back in 2012) On Wed, Apr 8, 2020 at 2:36 PM Ed Maste wrote: > > On Wed, 8 Apr 2020 at 14:23, Ryan Stone wrote: > > > > I seem to recall a git converter bug fixed many years ago that would > > incorrectly record an MFC as a merge if and only if a new file was > > added to the destination branch, so I would not be surprised if you > > are correct about this. > > By "a git converter" do you mean the converter behind the current > https://github.com/freebsd/freebsd conversion, or some other > converter? Because as far as I can tell now the svn2git we have just > doesn't handle mergeinfo at all. From owner-freebsd-git@freebsd.org Thu Apr 9 19:26:36 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 03E3327BE02 for ; Thu, 9 Apr 2020 19:26:35 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48yrjl0Nf2z48Nn for ; Thu, 9 Apr 2020 19:26:35 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 07A4427BDD2; Thu, 9 Apr 2020 19:26:35 +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 0735527BDCE for ; Thu, 9 Apr 2020 19:26:35 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) (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 48yrjj3rsLz48N9; Thu, 9 Apr 2020 19:26:33 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f44.google.com with SMTP id u2so716537iop.10; Thu, 09 Apr 2020 12:26:33 -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; bh=RtQ+BrFl0IoY/cd0Tyty7sOOykgGU/UwGXOnrggDocs=; b=cct/BPjQzTIbyN6E7e0xd3TDCipzCzbUfkuAL7tTZlK1AtAGAhoFOwi/59RSqdy/27 vRWnbhStUwBMgSWo5Gbk2SfgIhBQlWxGcT/esoh0ZugoL+JWgksFAj/C7sfFmg6SDDmq MP3/ch65ea4OqJnr/sXBEX2ne/EqQGQna31g29daIc4Qm73kXpDK7/3t67jxKnqiwUEK 14ejTfh4MwWTOkeUOjRE0C9J6nOK1ODQfiqPUYiEEVR6pgmAm40JctFUn1pp/1enqHRp ZnexAi0FKT6lVhKSZzETEpjvrXcbuQGB6VoZ8riYK0iabVmNYtLaMKM7t4WAHJw7Pc2q /HRA== X-Gm-Message-State: AGi0PuYMzOWgfMYyPA6RpvGyyunBpEoHV96zXnjI63QdFPXi4CJE+IBv NNpm05Hk2l7b4q4ADGGZ87D0yBaLDJfsGEJVWuW8hA== X-Google-Smtp-Source: APiQypLcYkggHuOIfqUqNCzAZ3d2UIybFVbSGZHMqw7hsb3bW9L2+21IFkKZCgbBRXONyL+bzMWdOIfYswVuljFATSI= X-Received: by 2002:a6b:5116:: with SMTP id f22mr771656iob.15.1586460391165; Thu, 09 Apr 2020 12:26:31 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 9 Apr 2020 15:26:19 -0400 Message-ID: Subject: Re: Strange commit To: Ryan Stone Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48yrjj3rsLz48N9 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.44 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.72 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[44.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.72)[ip: (-2.74), 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]; FREEMAIL_TO(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[44.166.85.209.rep.mailspike.net : 127.0.0.17]; 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_TLS_ALL(0.00)[]; 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: Thu, 09 Apr 2020 19:26:36 -0000 On Wed, 8 Apr 2020 at 15:00, Ryan Stone wrote: > > The converter behind the current tree on github (or rather, checking > my email, whatever uqs was running back in 2012) But - you believe it was fixed at the time? Because as far as I can tell svn2git has never understood mergeinfo. From owner-freebsd-git@freebsd.org Thu Apr 9 19:39:06 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 210A627C5FA for ; Thu, 9 Apr 2020 19:39:06 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48ys095qpQz49Cr for ; Thu, 9 Apr 2020 19:39:05 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id C61E827C5F9; Thu, 9 Apr 2020 19:39:05 +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 C5E4F27C5F7 for ; Thu, 9 Apr 2020 19:39:05 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 48ys094kg9z49Cq; Thu, 9 Apr 2020 19:39:05 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-qk1-x736.google.com with SMTP id j4so5273450qkc.11; Thu, 09 Apr 2020 12:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yLv4Xc2e2oHcSHRhUFtWvQY7rh+dtmhRryRo/qWBuEg=; b=WCY4FrdPZ2aL6SCy7IZOJeeEgel9g45u3wQd9ykCJspKLKiUyZChiqyE/9h4l/b7SF bGvT5WwTHSVON6gkwhp6BfzLAYiNSsYoHtgmUpx4ksrEY9eOb58t0Bm4HseW4LSqnWXX eMnFKe+ONs8DPoKK5ORpHbDh7NLucuusn8RAnvkeVI9NQbHIrmaLDIE21a32UaM8QpDa Ax6san8ed0KYdqMggV9UTMUfA4yOe3f+XwH7Hr0Qf2Aekm2w6LwplCncxCt31YnmSikZ 2JDhtokOwBdaPLehcQWnMIPPos/8qsg6RyqF00lk0IO81yq9vTVojuDsuAAlTx13NcHS BqXQ== 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=yLv4Xc2e2oHcSHRhUFtWvQY7rh+dtmhRryRo/qWBuEg=; b=TElVmdQjO3UAKUFP/OJHvAaClTIJO/BhurjtmdtCByn3cI4WAyybRLqoEjLMGl5mP/ dH3uUGRx6A755KhFKR6jLxzqoVfH/OX/kCxr26zjb0CEP0ZaINhNJut3yGSbEHug2SCr izdza2zBHOC4htpcOPw+k9QHhs/eWfBtaxxfC6JXJ0GjdHIFRc8X63lqHOhFa0pQBilG s2TRdD+dp2lwok4Ou7AamZRwLHoxFY0MSymDgVYC9fDUgr3FTE81chIal51bGz42Ziqe +JsQZ+C1OoEP+wfOL/At/IO58mwsMXhJ1uwO/iRcQ0HS0pG7w5o/5XuTFITAia9NXM9e PEEw== X-Gm-Message-State: AGi0PubB0U/0v8hP7PFjdiejv1CVq6lkJoJCvENyoKusPj+8WqpE56dY 31X8p7oyX/f81Z5pPgHeJv/mxxctFHhXR7glq/fc8g== X-Google-Smtp-Source: APiQypKeu3B6dX/TgHiD8i5Bu9/uhSetjw+xPjc7Pp4Nk7hVk+lTiloHm9Pebwfk1kqfr9FZMQdSdj7BNUrZAj2/ktk= X-Received: by 2002:a37:b2c5:: with SMTP id b188mr511642qkf.98.1586461144448; Thu, 09 Apr 2020 12:39:04 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ryan Stone Date: Thu, 9 Apr 2020 15:38:53 -0400 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48ys094kg9z49Cq X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] 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: Thu, 09 Apr 2020 19:39:06 -0000 On reflection, I believe that what as happening was that the converter was using newly created files as a really bad heuristic for merges so that it would not have to try and understand mergeinfo. On Thu, Apr 9, 2020 at 3:26 PM Ed Maste wrote: > > On Wed, 8 Apr 2020 at 15:00, Ryan Stone wrote: > > > > The converter behind the current tree on github (or rather, checking > > my email, whatever uqs was running back in 2012) > > But - you believe it was fixed at the time? Because as far as I can > tell svn2git has never understood mergeinfo. From owner-freebsd-git@freebsd.org Thu Apr 9 19:54:05 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 4BEBB27D02B for ; Thu, 9 Apr 2020 19:54:05 +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 48ysKT09y9z4BgK for ; Thu, 9 Apr 2020 19:54:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 0094227D028; Thu, 9 Apr 2020 19:54:05 +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 0055927D026 for ; Thu, 9 Apr 2020 19:54:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) (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 48ysKR6jjZz4BgF; Thu, 9 Apr 2020 19:54:03 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f41.google.com with SMTP id n10so854091iom.3; Thu, 09 Apr 2020 12:54:03 -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; bh=h3kkHIQNpN2DC7kaWB/K4tbvnD3unSeTdUr5CiDqJ1A=; b=eg6lgFn6h44Y+SdGf8F3aawISHsMTVbQ16Ssol2/mLz1DA3jgOySwnJJ1uN/m1f75j 1ALxONhgAuixmISMSLHXAsZZTGSRlXKEFEEVRDf5yAySLuzID5BZPSvguH65W/YCGqi6 qP9uuHvdwfPN1JdYCxbbI0qNfq8mvBRpjlKLLnM+gP4lGVdUePD2yB1Aun2ME8jwQnov U1dC7BNDX/4i936GW+MFbTsZCjISfOknm+5MrAQcTjBDAEiEbv0aTU/tgQOqxPES7ZTO /suz6RASXgU085g1D2faOqWSSMpTwE/05irjjCuPyh8KQLS4lXR09GUu8+mWOH/nEahz 26Vg== X-Gm-Message-State: AGi0PuZh+U8svg93IVoqQYepoZykaAuLTlG/163tg1pl8+FAfnMjjfyi aWlD34aQ1UOf1HNNo8i2nZ6u4am1+jqsHVL3F3c= X-Google-Smtp-Source: APiQypK8cP2uGXsSEe/ge/tmb4+lMKgvYpmrhu3jsjhwPtvQTz5aKrrgvNDzxHjpmxjzfTzFSPmy3VYLGnKcu5tlY/M= X-Received: by 2002:a02:69d4:: with SMTP id e203mr1149555jac.12.1586462042826; Thu, 09 Apr 2020 12:54:02 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 9 Apr 2020 15:53:49 -0400 Message-ID: Subject: Re: Strange commit To: Ryan Stone Cc: Kyle Evans , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48ysKR6jjZz4BgF 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.41 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.92 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[41.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.92)[ip: (-3.73), 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]; FREEMAIL_TO(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[41.166.85.209.rep.mailspike.net : 127.0.0.17]; 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_TLS_ALL(0.00)[]; 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: Thu, 09 Apr 2020 19:54:05 -0000 On Thu, 9 Apr 2020 at 15:39, Ryan Stone wrote: > > On reflection, I believe that what as happening was that the converter > was using newly created files as a really bad heuristic for merges so > that it would not have to try and understand mergeinfo. Ah, ok - so that's consistent with what I've inferred from looking at a number of vendor updates. Yang (one of my co-op students) is currently working on a tool to parse svn log / svn diff / svn propget svn:mergeinfo and emit a list of merge-to/merge-from revisions. From owner-freebsd-git@freebsd.org Fri Apr 10 20:35:36 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 0D0952786D3 for ; Fri, 10 Apr 2020 20:35:36 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48zVBv5TdVz4X5t for ; Fri, 10 Apr 2020 20:35:35 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id BA61D2786D2; Fri, 10 Apr 2020 20:35:35 +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 BA23F2786D0 for ; Fri, 10 Apr 2020 20:35:35 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) (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 48zVBt578Lz4X5s; Fri, 10 Apr 2020 20:35:34 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f68.google.com with SMTP id n25so2936920otr.10; Fri, 10 Apr 2020 13:35:34 -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; bh=PqRspsG5w25589KYqjLsaG9B51Zmqedi3uuRyPwRG58=; b=itSkPXD1lCxD/gPy+FCOeck+BhhfoenjpeKfxHYr2cbkvj/WPMCmhBG6RaRAO29d9u mZSDj8o8mNjjY2782uVGxY0mM+C4A+dkrhSxMyt6fhNxsWAuPGcgiVhYFDXyjzFdWOLC 8BVk5B9gOcX+Maa3D2TmlAP93TePbsXvLdkWwMSSFOlOl2CWI5IqxyIaBqQ5F4ev9nx4 DadxsFJ2GdeBoKlafcHq0lEBmslLW4DiFIPV9D8IImCQ7vZp1ThzxOwF/mAZKz3CND7/ 9WWxAxN8SWY3Un0SvluN4o1CRoyfzfWiuAJZ98dyGCBz21Uf0IePiWeS5dCfwfZ+jEkQ xDFQ== X-Gm-Message-State: AGi0PubEr6qaKJ3nX+2cTElti07crcWLGb+PbFXKLpQzCSAKKM+tjn8i CMNSOtg8tENiEzxaXebjnhAOwfmC5QFjD/wDwOa5rhhg X-Google-Smtp-Source: APiQypLvbDOKT2MLgRnxzkyEA0159Ekq+ArL5a+TcESeMCn6/yhO+468gKrnOf4bvPeoyukz8TazSLyWU+PWS0M2Eo4= X-Received: by 2002:a4a:d30c:: with SMTP id g12mr5321455oos.16.1586550932806; Fri, 10 Apr 2020 13:35:32 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Fri, 10 Apr 2020 22:35:09 +0200 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: Ryan Stone , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48zVBt578Lz4X5s X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.68 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-2.16 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.991,0]; RCVD_COUNT_TWO(0.00)[2]; 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:c]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[68.210.85.209.list.dnswl.org : 127.0.5.0]; RWL_MAILSPIKE_GOOD(0.00)[68.210.85.209.rep.mailspike.net : 127.0.0.18]; IP_SCORE(-0.17)[ip: (0.02), ipnet: 209.85.128.0/17(-0.40), asn: 15169(-0.43), country: US(-0.05)]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; 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)[uqs@freebsd.org,uspoerlein@gmail.com]; FREEMAIL_CC(0.00)[gmail.com] 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: Fri, 10 Apr 2020 20:35:36 -0000 Am Do., 9. Apr. 2020 um 21:54 Uhr schrieb Ed Maste : > On Thu, 9 Apr 2020 at 15:39, Ryan Stone wrote: > > On reflection, I believe that what as happening was that the converter > > was using newly created files as a really bad heuristic for merges so > > that it would not have to try and understand mergeinfo. > > Ah, ok - so that's consistent with what I've inferred from looking at > a number of vendor updates. > > Yang (one of my co-op students) is currently working on a tool to > parse svn log / svn diff / svn propget svn:mergeinfo and emit a list > of merge-to/merge-from revisions. Cool stuff, if he can do it in Qt/C++, then we can pull that directly into the converter. I've frankensteined a variant, where the places with a mergeinfo change will at least dump an svn diff output (as I'm too stupid to understand the SVN/APR API nonsense). See https://github.com/freebsd/git_conv/commit/b6beacb522c503dba3da31b38feffa812517bc66 and followup commits. Cheers Uli