From owner-freebsd-git@freebsd.org Thu Apr 2 19:35:20 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 E984C261A9D for ; Thu, 2 Apr 2020 19:35:20 +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 48tYDw5y3wz48C4 for ; Thu, 2 Apr 2020 19:35:12 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 11674261A9B; Thu, 2 Apr 2020 19:35: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 CF716261A98 for ; Thu, 2 Apr 2020 19:35:04 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) (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 48tYDk0dNKz488N; Thu, 2 Apr 2020 19:35:01 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f67.google.com with SMTP id o127so4969807iof.0; Thu, 02 Apr 2020 12:35:01 -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=xZ4T5d2T5jIUp9S9/6rD02t0UdOhQpFXyE/NunaEEHc=; b=EAsgLTcQ/oRMboSDHhIK7g2Wo2qxqn781KsyqTODMq+3TFlxz8kfXGV8zxTw1DwAvx Rb4+S+nxjXvi3r5QJzKGcPtuIC5mwwasUQ7rmNJ1MapPbqjUP/UGLaWzQI5g/VK9VchX zoyeG11+fI/KvbVgZZ2p8YvXUmpu4ZxTsMD4uxLIwN1vz1hFthCY04uT3jmfJ8Qd+ZDm pQlqpIiU4QWeXky+BF0NjZ2dnueNvcRVXsTFXOX3fw3C5nL3dDMf9P4LQT78EzVtpkqK hAPzP2RLyoIJwE1PnXsa0ySr+XR8of0r7P6+ZWYDlDtpQvIXDhknIijjxQ81QIYt3WUI sgqA== X-Gm-Message-State: AGi0PuYV6KePclINSvzrMYYn/o30u9DdDIYmrKe5mux41vwEfrGkGyP/ ARhYbnju0B0SXLIxl9RULzO6KQbIkc+4we1emFtDgt7o X-Google-Smtp-Source: APiQypLkoZYbLXfGoDOrPwczs5d0rpQjGzmSKFaKQDW1g7pGAw/y/pcIAKxBZoUKVXfVV/5TCna72qHqc9Dbhoe8fRE= X-Received: by 2002:a92:4858:: with SMTP id v85mr5141581ila.100.1585855710529; Thu, 02 Apr 2020 12:28:30 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 2 Apr 2020 15:28:17 -0400 Message-ID: Subject: Re: Strange commit To: Kyle Evans Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48tYDk0dNKz488N 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, 02 Apr 2020 19:35:21 -0000 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