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.