From owner-freebsd-git@freebsd.org Thu Apr 2 17:10:22 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 4BE6C2ACF34 for ; Thu, 2 Apr 2020 17:10:22 +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 48tV1k3p8Wz4BhV for ; Thu, 2 Apr 2020 17:10:18 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id CABF92ACF26; Thu, 2 Apr 2020 17:10:10 +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 A8A2D2ACF25 for ; Thu, 2 Apr 2020 17:10:10 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f176.google.com (mail-il1-f176.google.com [209.85.166.176]) (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 48tV1W3jxWz4BfC; Thu, 2 Apr 2020 17:10:07 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f176.google.com with SMTP id x16so4322671ilp.12; Thu, 02 Apr 2020 10:10:07 -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:content-transfer-encoding; bh=SNp14IEDj7zJvjK6UCOGK86TFCIjAPVxFIzy6Uh9/Ew=; b=sR925/B6wd/b1FLRnAOmyZ+WqIhdIcmwrbNAWD4FX/54REPPhlbkLEu1KHQQdxngiH 6PbZqDDGpLTC/dsbgNojanSOuqK9lPJUIlew95uExpO0qeEoS2BKEEb6YugBXfoBHDa9 0jhNoT+RV7lXIyW0FfdgsyTR91rPE9l7sF0yzYvx0aNw22rP2Kax2jw6X9OUgDWjIiQn b7QsTWtQyObRebnV206urN1QO43f7LrwDDJdZ9th9u0dnH5Q2902NA2rss6Ps0IJa/F0 XmK2G+sEYQT11/Y7hjgYFEq3kWbHG7EQFOg7qpCRGIACH42cJNeKoriygqvT809wopsm C7AA== X-Gm-Message-State: AGi0PuYG78CAq2W6VkpbF0atO8f6ni43lxujwvDERJngiOqBpKn4GCQ3 uaE9/EvksBZw0CYYLMGrtybGF8qAUmMl+zQs4CvUJv1V X-Google-Smtp-Source: APiQypJ/8EgE+DYLBdtUeCj/STRCQAYwOigLSnZABW8u9M6YAeclu6GvXg+yCvkReyzKdOVFRi697BXIJHopRyiIF/M= X-Received: by 2002:a92:41c7:: with SMTP id o190mr4205974ila.11.1585847396692; Thu, 02 Apr 2020 10:09:56 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 2 Apr 2020 13:09:44 -0400 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48tV1W3jxWz4BfC 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 17:10:22 -0000 On Thu, 2 Apr 2020 at 08:50, Ulrich Sp=C3=B6rlein wrote: > > > svn path=3D/head/; revision=3D337810 > > > > This should be a merge commit, but isn't. Can someone look into it? > > Hey Warner, this is not a merge commit in SVN either, see > https://svnweb.freebsd.org/base?view=3Drevision&revision=3D337810 and not= e > the lack of a "Copied from" message there. Note that it does have mergeinfo added, indicating where it was merged from= : % svn diff -c 337810 | egrep -A4 '^Property changes on' Property changes on: contrib/lua ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,1 ## Merged /vendor/lua/dist:r326353-337809 As far as I can tell the first commit after the switch to svn recorded as a merge by svn2git is r180407. In the existing https://github.com/freebsd/freebsd mirror: commit 5fd3bac82eb9e3ba73a8a18d9badc977aef7f6e5 Merge: b07b40d7feb6 6ae22f7302b6 Author: peter Date: Thu Jul 10 02:08:00 2008 +0000 Merge gnu cpio 2.6 -> 2.8 changes. Unfortunately, we have massive conflicts due to radically different approaches to security and bug fix= es. In some cases I re-started from the vendor version and reimplemented ou= r patches. Fortunately, this is not enabled by default in -current. It has this mergeinfo: Property changes on: contrib/cpio ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /vendor/cpio/dist:r180400-180402 https://svnweb.freebsd.org/base?view=3Drevision&revision=3D180407 It includes a number of files that report "Copied from:" Looking at the history in contrib/lua it looks like only the initial import, r326353, is recorded as a merge in svn2git. Is it possible that svn2git only detects a merge if new files are added -- i.e., a SVN merge from vendor that only updates files but does not add any new ones is missed?