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