From owner-freebsd-git@freebsd.org Sun Mar 29 21:34: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 0390E265256 for ; Sun, 29 Mar 2020 21:34:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48r8456C5Pz40b7 for ; Sun, 29 Mar 2020 21:34:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 0AE06265255; Sun, 29 Mar 2020 21:34: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 05850265254 for ; Sun, 29 Mar 2020 21:34:05 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (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 48r83l0v6Qz40VQ for ; Sun, 29 Mar 2020 21:33:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2b.google.com with SMTP id s18so3503676qvn.1 for ; Sun, 29 Mar 2020 14:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ascFzMtJcbWIHydpqhoZn6xNLbRixcQ4K2bCv01aWPI=; b=dUJvgagvFpFOGM/IymwuBaqQhZ0qZFg7/w/QWgn1lAz3RF+nC9zgbk2YTkJdnIY/tf qqUiBPgBoM4TuqpXiyskNe+xPbrJN3QOdDuFpqNwVFBd2Nv5ORfVLYnh1w5qKES7NNLC W9a67WJhYHd0TJNJKWvkTcEZUnTWCsL3VgsDNB7bzWjLke0sHEXU/SVPknUrEdFFMPcX 5r5gqNYDAucSsDIbSMSRZhvdk1Eiob4G8mo5SmPp3OrsWvlbTvDHbyx75clJnIY15XJB hj5u29V76df7TiM2LXKf97fzYfj93Jkw3I6VMx+uUic8u4A2z23d/2B7tdEM8Nd0EWJb cmXw== 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=ascFzMtJcbWIHydpqhoZn6xNLbRixcQ4K2bCv01aWPI=; b=itYskOVbVvwA/UD90EU4CqpqkUlvFHcyPCUDu15RdBcZFMn6zODCNbnyVw5yESqimw jSbkz7OxvgKl/UFvSOqpfOvOVAlodq4Y0o34h7FcGT5m4Il2SFKg1canyXfjgec4jWnX f5aoLsSS44qH3F1+LaL5p4L1m70TSQCR/LOSGGRG+u0cLjHcdUctvcPRGgxqZst+FAmi uht4XLlr26rbHGEStiu9vfaR+whjs9WsLpLqsf3rC5xztvAxMWvJ1s24OouvCCaWWwrS D210kBeRsNEaOwQ9qF06Bx9T+cQp0KjscGDIFgoKizAGTwjaYHTvn7FX82GaxDqVqTOA txtA== X-Gm-Message-State: ANhLgQ1g97TVauoFfZOKa2RK+ZcHHnKKpatkoqvLcosxbjSJOqM1uwcK uaapbUeI9h07C7/yjgbREYIq/qgpiTXTW9aHRMEmuQ== X-Google-Smtp-Source: ADFU+vtN6J/VJ5dm36P4wbzZPFKlZFAA3+hTJZCojkdotGBFhXIQoFkad4ywNBzsa6FFbN5sWFaajRFLGYC/uKCyR0k= X-Received: by 2002:ad4:496b:: with SMTP id p11mr9109255qvy.202.1585517625927; Sun, 29 Mar 2020 14:33:45 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sun, 29 Mar 2020 15:33:35 -0600 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org X-Rspamd-Queue-Id: 48r83l0v6Qz40VQ X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=dUJvgagv; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.25 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCVD_COUNT_TWO(0.00)[2]; URI_COUNT_ODD(1.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[b.2.f.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]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-1.25)[ip: (-5.40), ipnet: 2607:f8b0::/32(-0.36), asn: 15169(-0.46), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_CC(0.00)[gmail.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Sun, 29 Mar 2020 21:34:22 -0000 On Fri, Mar 27, 2020 at 3:21 PM Ed Maste wrote: > On Fri, 27 Mar 2020 at 17:06, Warner Losh wrote: > > > > I'm sorry, that's a *HUGE* change from what we decided. And it doesn't > lose the ability for us to maintain our own local changes easily... > > My understanding has always been that we would maintain the vendor > history in our tree, as we do today in the existing svn2git conversion > (i.e. https://github.com/freebsd/freebsd) with elftoolchain. This is > the configuration that I have prototyped and experimented with. > > This does not and has never implied that we'd have *all* of the > upstream history of every piece of contrib software that we use, just > that in the history for a contrib component we have our versions > (i.e., what's in contrib/ today) as well as the snapshots > corresponding to upstream revisions (i.e., vendor/). > Ah yes. You're right. I'd gotten confused as to the exact context. Absent the ability to automatically and retrospectively generate git subtree/subrepo commit metadata (which would be quite hard and likely error-prone), that's the only way to record that. Warner From owner-freebsd-git@freebsd.org Thu Apr 2 07:26:09 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 B878327224F for ; Thu, 2 Apr 2020 07:26:09 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48tF3b35zXz4Wjs for ; Thu, 2 Apr 2020 07:26:03 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id A61522721CF; Thu, 2 Apr 2020 07:25: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 A50242721CE for ; Thu, 2 Apr 2020 07:25:55 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (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 48tF391yj5z4Wc4 for ; Thu, 2 Apr 2020 07:25:40 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-oi1-f170.google.com with SMTP id d3so2008641oic.1 for ; Thu, 02 Apr 2020 00:25:40 -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=TGfTWhcZfBEE6q53PH+JkehkbGUjXvhC74dKw3QQhJM=; b=hmsspISY+smYyTisVPrVrXBEnoG2wFG9qxDW0hzsyVh8jph5YhupkVwzx/Xbc4QUiB Rl0kCqSbhoWHBeJ2ryuHJRq3CSVkMG8aqLtWLTo2MFluT7DH6Zx9Q/dGzbqh48PZYZH3 3yXShVELaXTL8Do3EV/7tCotU8mX7QixN+xxkRcqpasNZ6Cty2xSisYTHdOlmSSQx5sx eT939bbuw4yF4rERXMi/Ofx7ZzfMZt0aEUHc60/bmrg9fbVR/ukpkPPHxWw4FjrwfAhs Ye/XwQ9KCVJUacFxKtKTLwER4NMAn+7gs8wlOnWeoh6wccufoZ3dulprYWDllV5APcB1 5dOQ== X-Gm-Message-State: AGi0PubCGkEyc3bxE32bZkBzpDkKlBSM6KOF5HjihfUeQ6kOv6WhW9+e iC4R41J86SgPz3vGCMkzrr6MqS/oJF4Xdwi7uGA= X-Google-Smtp-Source: APiQypL5Lfu5d+8ddo/SNK+NWawvPEoiNFEm8pqaWKGtkr5ibNmRHFF+4CsXtFSw00+7WMOS1RssYGOu51H2k8aaIcw= X-Received: by 2002:aca:c45:: with SMTP id i5mr1165182oiy.101.1585812333660; Thu, 02 Apr 2020 00:25:33 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Thu, 2 Apr 2020 09:25:10 +0200 Message-ID: Subject: Re: Strange commit To: Warner Losh Cc: git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48tF391yj5z4Wc4 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.167.170 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-2.30 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[170.167.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.30)[ip: (-0.44), ipnet: 209.85.128.0/17(-0.55), asn: 15169(-0.44), country: US(-0.05)]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[170.167.85.209.rep.mailspike.net : 127.0.0.17]; 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_TLS_ALL(0.00)[]; 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: Thu, 02 Apr 2020 07:26:10 -0000 Am Di., 10. M=C3=A4rz 2020 um 18:22 Uhr schrieb Warner Losh : > > From my github freebsd mirror: > > commit 48babfba2e3da8bb5457300b288bbf22db3ff646 > Author: kevans > Date: Tue Aug 14 18:58:01 2018 +0000 > > MFV r337586: lua: Update to 5.3.5 > > Bugfix release, nothing too major. > > Tested with: lualoader via userboot, lualoader live > Differential Revision: https://reviews.freebsd.org/D16665 > > Notes: > 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 note the lack of a "Copied from" message there. 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? From owner-freebsd-git@freebsd.org Thu Apr 2 17:44: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 A11482AE258 for ; Thu, 2 Apr 2020 17:44:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48tVmr6qDxz4PkB for ; Thu, 2 Apr 2020 17:44:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id A43282AE24A; Thu, 2 Apr 2020 17:44: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 A30252AE249 for ; Thu, 2 Apr 2020 17:44:05 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) (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 48tVmW32cpz4Pdw for ; Thu, 2 Apr 2020 17:43:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io1-xd44.google.com with SMTP id o3so4586318ioh.2 for ; Thu, 02 Apr 2020 10:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9x6pZ73DJbw+n1T27BTuJ0niKHlW5GpdK++0ssjGDUo=; b=lB6vrCMSUen2/aC5r4Dt6s0ZLmbhLUn6REhqduIcEXCrbYEzIss0PediePRyE+HBGD agrVOIEhfdnlIneqDMoJmvrwqjnFPXWWEEbTIx0SsfMPFVZSs26/Ge9gvxUKU4rttbeI ZkdwG74p7rffp7crBQ4+ZBj8SdVaN03llr9+ou6NPnlBl6S0s0KCwL/oHcc7F0LG4HeN 1N3vMjypfkhmvNrrMuspkNOTSJcF04jE7EaUm2WNhT0lW6q5xLpReIXVsbZv88BKaobP S/Vwr6NKlA0O77crtfExI5FICGfmVIcFp0qobRCNG/uvBE71iRRD1GJhocWcLc757JKR GACQ== 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=9x6pZ73DJbw+n1T27BTuJ0niKHlW5GpdK++0ssjGDUo=; b=AlLZAb4GVAOfbt0If/2Mz06+ApHaAw9HA7Hc+zQITTfIdCgOblSxtjcsJ2E2iVt7OI q2jeSv2gRpmoVRib5CCj+O5Q1Yj9FL5G5D7KEzBIA41eFdzv5mxSpkeQaR2Z1VpO9vVt ITpdSvLjS0HpVuruiDumQbMNnmKa6+k0xyUR2YdEJtst2muMzfxUT2HmZa+9pSIjdr6q diCrdwh5fUzvEK10XsX0Q+pnGijEbVFwuVha03ansvgOEeeHFm/fcaXuGlIUmff3fbim 4RcluwAiUg57UQDrJ/lcGFWkfWBcBOYn65fhYN7gMSDc00+m+sP6Kd9AfGEA1v5zzKj2 8LBw== X-Gm-Message-State: AGi0Pubj+N3ZIgSznGINBhz/wVmcJPeGa+scxut75AgBxDdROtbWr8Ki etx+Ryh5SNDT9wvbIOpjA2xz+KwoNEksyic3IyDRFBkg X-Google-Smtp-Source: APiQypKsVI+1s2DGYxCCwkorFCBEh+pvZX4P9wPK5ZZcgLHgGhOFwjO5HUh81NAxMbBTja2uzLOKvB0vGDcSw/IO2SE= X-Received: by 2002:ae9:d886:: with SMTP id u128mr3841349qkf.240.1585843329446; Thu, 02 Apr 2020 09:02:09 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Thu, 2 Apr 2020 10:01:58 -0600 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: git@freebsd.org X-Rspamd-Queue-Id: 48tVmW32cpz4Pdw X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=lB6vrCMS; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::d44) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.11 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[4.4.d.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]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-0.11)[ip: (0.27), ipnet: 2607:f8b0::/32(-0.34), asn: 15169(-0.44), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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:44:22 -0000 On Thu, Apr 2, 2020 at 1:25 AM Ulrich Sp=C3=B6rlein wrote= : > Am Di., 10. M=C3=A4rz 2020 um 18:22 Uhr schrieb Warner Losh : > > > > From my github freebsd mirror: > > > > commit 48babfba2e3da8bb5457300b288bbf22db3ff646 > > Author: kevans > > Date: Tue Aug 14 18:58:01 2018 +0000 > > > > MFV r337586: lua: Update to 5.3.5 > > > > Bugfix release, nothing too major. > > > > Tested with: lualoader via userboot, lualoader live > > Differential Revision: https://reviews.freebsd.org/D16665 > > > > Notes: > > 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. > Yikes! OK. Kyle had sworn up and down that he did a merge commit... Warner From owner-freebsd-git@freebsd.org Thu Apr 2 18:50:58 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 BAE3D2603BE for ; Thu, 2 Apr 2020 18:50:58 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48tXFs4Jvpz3MVn for ; Thu, 2 Apr 2020 18:50:57 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id CDC452603BA; Thu, 2 Apr 2020 18:50:52 +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 CD4D92603B9 for ; Thu, 2 Apr 2020 18:50:52 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48tXFk2FFcz3MSd; Thu, 2 Apr 2020 18:50:50 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id C445ACCFE; Thu, 2 Apr 2020 18:50:43 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f173.google.com with SMTP id i3so4264941qtv.8; Thu, 02 Apr 2020 11:50:43 -0700 (PDT) X-Gm-Message-State: AGi0PuYjbFAYNuzsF1BWDpdeiHKQMRaOYf3VWtY/D803Q+mCdkefy/QA X8nBVSKLkFNW3i68JWQVgDco5v/KpKESGoBsK2o= X-Google-Smtp-Source: APiQypKdIlMgOv2o02hpwANfrJmcN55JLuLMUPFa4jq5XqDUDct+2UeEQvOyk9MOOwgXDR5FnZdEzBn374PqGESlDVE= X-Received: by 2002:ac8:6f14:: with SMTP id g20mr4602012qtv.53.1585853443166; Thu, 02 Apr 2020 11:50:43 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Kyle Evans Date: Thu, 2 Apr 2020 13:50:30 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Strange commit To: Warner Losh Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 18:50:58 -0000 On Thu, Apr 2, 2020 at 1:46 PM Warner Losh wrote: > > On Thu, Apr 2, 2020 at 1:25 AM Ulrich Sp=C3=B6rlein wro= te: > > > Am Di., 10. M=C3=A4rz 2020 um 18:22 Uhr schrieb Warner Losh : > > > > > > From my github freebsd mirror: > > > > > > commit 48babfba2e3da8bb5457300b288bbf22db3ff646 > > > Author: kevans > > > Date: Tue Aug 14 18:58:01 2018 +0000 > > > > > > MFV r337586: lua: Update to 5.3.5 > > > > > > Bugfix release, nothing too major. > > > > > > Tested with: lualoader via userboot, lualoader live > > > Differential Revision: https://reviews.freebsd.org/D16665 > > > > > > Notes: > > > 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 n= ote > > the lack of a "Copied from" message there. > > > > Yikes! OK. Kyle had sworn up and down that he did a merge commit... > 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. 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