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