From owner-freebsd-git@freebsd.org  Thu Apr  9 19:54:05 2020
Return-Path: <owner-freebsd-git@freebsd.org>
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 <freebsd-git@mailman.nyi.freebsd.org>;
 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 <freebsd-git@freebsd.org>; 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 <git@mailman.nyi.freebsd.org>; 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: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com>
 <CAJ9axoQOat+rgZ_69jwwf90NKUbLNuCz1SdjGvA4ufjE07hrGA@mail.gmail.com>
 <CANCZdfpgDt0=BeTg9m+D1CT=R-ioBctO4_M79yt39XrdRHhGzw@mail.gmail.com>
 <CACNAnaEkRf7f-4yKaNo7v=FCXR63qQeS+y-q0+hTuG6-6N_MbQ@mail.gmail.com>
 <CAPyFy2CyY7aVGa0DB4Lue16CrhrDs_o3QoXm8UMt0qajMX4pgQ@mail.gmail.com>
 <CAFMmRNzDdn5J2V2TOB7aAQ-FXoJxwPH+VVy5f5OwQDvtn4Hteg@mail.gmail.com>
 <CAPyFy2CUHbiBN5STdGLgxqGafQTi3NUf5Mr_v-A_S75YOqKLuQ@mail.gmail.com>
 <CAFMmRNy5kBOZyiFeLDQi70-V1Vja2QJ3m_HyCemNmZBT9wr_eg@mail.gmail.com>
 <CAPyFy2C3z+GVp5LKgwpT1r5wNNr+QJQY76Aq-edDY8+jM0aHKg@mail.gmail.com>
 <CAFMmRNyFARV=sg_cH94np7uWazh4HzMeWA0hEnSkd2282ACX0w@mail.gmail.com>
In-Reply-To: <CAFMmRNyFARV=sg_cH94np7uWazh4HzMeWA0hEnSkd2282ACX0w@mail.gmail.com>
From: Ed Maste <emaste@freebsd.org>
Date: Thu, 9 Apr 2020 15:53:49 -0400
Message-ID: <CAPyFy2CR9XbzxcGOuL8MnyrVBH_MPef-AdddcQXpjE0kJX1f1g@mail.gmail.com>
Subject: Re: Strange commit
To: Ryan Stone <rysto32@gmail.com>
Cc: Kyle Evans <kevans@freebsd.org>, 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 <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Apr 2020 19:54:05 -0000

On Thu, 9 Apr 2020 at 15:39, Ryan Stone <rysto32@gmail.com> 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.