From owner-freebsd-git@freebsd.org  Wed Mar 11 16:31:20 2020
Return-Path: <owner-freebsd-git@freebsd.org>
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 BBDF6264FBB
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Wed, 11 Mar 2020 16:31:20 +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 48cyBv531jz3JDj
 for <freebsd-git@freebsd.org>; Wed, 11 Mar 2020 16:31:19 +0000 (UTC)
 (envelope-from uspoerlein@gmail.com)
Received: by mailman.nyi.freebsd.org (Postfix)
 id 6BF1B264FB3; Wed, 11 Mar 2020 16:31:19 +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 6B408264FB2
 for <git@mailman.nyi.freebsd.org>; Wed, 11 Mar 2020 16:31:19 +0000 (UTC)
 (envelope-from uspoerlein@gmail.com)
Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com
 [209.85.210.45])
 (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 48cyBv0NB1z3JCc;
 Wed, 11 Mar 2020 16:31:18 +0000 (UTC)
 (envelope-from uspoerlein@gmail.com)
Received: by mail-ot1-f45.google.com with SMTP id v22so2616304otq.11;
 Wed, 11 Mar 2020 09:31:18 -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=VuW0jE5Vbj9tJh6GrqKnQ1bdKd7BXuUWDAoYukLqdFY=;
 b=UcqbmOuCVMHbcs5Wfyb2jhL9jkczzcnB8apdUnfKpqyJYbEDcZgqsaBRNIYKgcPwzO
 x/d0hLi76eWDjwVDQdzwaslbRgPqig4bWZ2kOr+p6vji0AjWYkdKamxtFPxFQiIJepgQ
 eDYO7iBtckQDmf99sdJWtZWrHHsb5JthYCmdFvJTWs+odPVDyDzCPnRXLJ2kb+hiclTO
 ofqtgyDin5h7WaRifv5Q3A/vI1tH7VpBRtOzLe2JJAY/iZOp1EKys25Ykx3GcWS6z0jf
 dET6vxdNLpeTO7ZUdJYY65XDsjBgpMft79KCmtlV20r8LK7S7JM9/lv40AfJZBxHR1Vo
 MQ6w==
X-Gm-Message-State: ANhLgQ2ZGkHHnCJ/H8Qj66lvp9SgttuWIHBkUcn/T+xo6tjC+kj8yKx3
 9vjJFLHboYMoPdatD62r2j5edM8/7Ehf3lHQr5D/WA==
X-Google-Smtp-Source: ADFU+vsMG3Y61nUrYJ/M9vtZdwz3KyMKVvZlV2QdkmXWRnLk0dldR7qiKl5n1NMqli5GSfHNi9yt5PUb0k7ZQVDY9Uc=
X-Received: by 2002:a9d:6ad9:: with SMTP id m25mr3080019otq.119.1583944277152; 
 Wed, 11 Mar 2020 09:31:17 -0700 (PDT)
MIME-Version: 1.0
References: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com>
 <CAPyFy2Dm12BD4yuGo65T_tQrGXapZxvSSurO=Gwn=2S1drq6ig@mail.gmail.com>
In-Reply-To: <CAPyFy2Dm12BD4yuGo65T_tQrGXapZxvSSurO=Gwn=2S1drq6ig@mail.gmail.com>
From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org>
Date: Wed, 11 Mar 2020 17:31:06 +0100
Message-ID: <CAJ9axoQ8afmxpe1foY-4nU646wwYyA3M0gUXx2htGOcipvRF9A@mail.gmail.com>
Subject: Re: Strange commit
To: Ed Maste <emaste@freebsd.org>
Cc: Warner Losh <imp@bsdimp.com>, git@freebsd.org
X-Rspamd-Queue-Id: 48cyBv0NB1z3JCc
X-Spamd-Bar: -----
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [-5.99 / 15.00];
 NEURAL_HAM_MEDIUM(-0.99)[-0.992,0]; REPLY(-4.00)[];
 NEURAL_HAM_LONG(-1.00)[-0.999,0]
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 <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Mar 2020 16:31:20 -0000

Am Di., 10. M=C3=A4rz 2020 um 18:30 Uhr schrieb Ed Maste <emaste@freebsd.or=
g>:

> On Tue, 10 Mar 2020 at 13:22, Warner Losh <imp@bsdimp.com> wrote:
> >
> > From my github freebsd mirror:
> >
> > commit 48babfba2e3da8bb5457300b288bbf22db3ff646
> > Author: kevans <kevans@FreeBSD.org>
> > 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
>
> With a quick look it seems there are several cases - I tried
> git log --no-merges -i --grep 'update to'
>

This is intentional, please see
https://github.com/freebsd/svn2git/blob/1a0b3e0230e1b2430e5d8eb91ac99aeff5a=
1614d/src/svn.cpp#L883

Only projects and user branches are represented as merges to master, as
they usually have a full tree. This seemed to match the git model better
(as opposed to the SVN model).

Not sure whether we really want to handle these "code drops" as proper git
merge commits. I fear what that might do to the history ...