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