From owner-freebsd-git@freebsd.org  Thu Apr  2 18:50:58 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 BAE3D2603BE
 for <freebsd-git@mailman.nyi.freebsd.org>;
 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 <freebsd-git@freebsd.org>; 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 <git@mailman.nyi.freebsd.org>; 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: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com>
 <CAJ9axoQOat+rgZ_69jwwf90NKUbLNuCz1SdjGvA4ufjE07hrGA@mail.gmail.com>
 <CANCZdfpgDt0=BeTg9m+D1CT=R-ioBctO4_M79yt39XrdRHhGzw@mail.gmail.com>
In-Reply-To: <CANCZdfpgDt0=BeTg9m+D1CT=R-ioBctO4_M79yt39XrdRHhGzw@mail.gmail.com>
From: Kyle Evans <kevans@freebsd.org>
Date: Thu, 2 Apr 2020 13:50:30 -0500
X-Gmail-Original-Message-ID: <CACNAnaEkRf7f-4yKaNo7v=FCXR63qQeS+y-q0+hTuG6-6N_MbQ@mail.gmail.com>
Message-ID: <CACNAnaEkRf7f-4yKaNo7v=FCXR63qQeS+y-q0+hTuG6-6N_MbQ@mail.gmail.com>
Subject: Re: Strange commit
To: Warner Losh <imp@bsdimp.com>
Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org>, 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 <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: Thu, 02 Apr 2020 18:50:58 -0000

On Thu, Apr 2, 2020 at 1:46 PM Warner Losh <imp@bsdimp.com> wrote:
>
> On Thu, Apr 2, 2020 at 1:25 AM Ulrich Sp=C3=B6rlein <uqs@freebsd.org> wro=
te:
>
> > Am Di., 10. M=C3=A4rz 2020 um 18:22 Uhr schrieb Warner Losh <imp@bsdimp=
.com>:
> > >
> > > 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
> > >
> > > 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.