From nobody Wed Jan 31 05:07:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPqmq4HVRz58RJ6 for ; Wed, 31 Jan 2024 05:08:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPqmq2ZMcz4bPM for ; Wed, 31 Jan 2024 05:08:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-55f8abbeeddso135494a12.1 for ; Tue, 30 Jan 2024 21:08:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706677688; x=1707282488; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Mghc1pFHRq4WuPFRhzGYpPORUUmwUD5Jv3dOZDYVphU=; b=Z/xXdaEGWG5dFXJ4/H8nnTVeSGdahcsl4SWgdQ33xAzO3TdtiXpYSdd+u9bDaYtGKN H0OHHYdR4b4AsM7PNmTrrHcfFc2LZ0oNxxu8dNaZ5RxiQjRTSF+1PK5CWYNBd3erCunB +RJBI4gU3qWgBiMXz1T7Syh3ku4BtWfhk09fid2kmHGPXsq6JFlThYP0WkFibUD1waYK UEh9TZq5lCe8hLQaw2TX+/PI4Ms2eXq+GPGPKgmedOXFpZ2O1vSGV+fuN8JjlPj64LV1 D/yPDbcaaWNToOwn3+EhQOy2zlVMJLfKMukYwYjfUrz22G1dC5QlWg0BznjhgLkIHZ0J 6ptQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706677688; x=1707282488; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Mghc1pFHRq4WuPFRhzGYpPORUUmwUD5Jv3dOZDYVphU=; b=BAI1hZm64OYsn1twK6s3jlUajuNVg115r/Nwn+70fOutzxdnTN7VWdiwPxpkRZAw+x psF82pj8BuSBmgeQmK+ZjFrME6FqIIcM3CFOjT1D/6s0Fd63jMtP4SQgEGp7kccyR/aS As9AXx3z2sgBvlpL/NK6SK28wJATCEpEF69i+P2P3OIe7fHD7moTF35l4L20sD/M/BEW /33gdK39iPgqQpcUNiHPMZKyj0L4v8melBs+CS8Hq1KBSgdsFqHwEHQ3uotEszOgW0cr IvAcQTca9QSqZGnb4rEyuueFWSSv05l1ddUUXVVtBYCgi299LUJ2Uu8YrFuQuwkffGZL RCGA== X-Gm-Message-State: AOJu0Yzd7wY0f0755UfAqCKBNTMvZleGK2owYHDnOdk0Eyhsn+pBlGOF p95M6OXsaOq2g9DmfpB0320nbvSROBziO/6DsHy4XyFQNKzRfPCTmDJJYGAsL2grkuvtiw05A3B SFeV9fuPU02cN2WydnoNCtuFMEyVWH1cSZeq1KQ== X-Google-Smtp-Source: AGHT+IG1Kjo+vAyyHoE3T+sTyidGJq1rfR7dB6Ywng9jCLeEQrxUi7dpT7WH+U6sNwqZBJPToXi6tjkcgw7CM/zA3hE= X-Received: by 2002:a05:6402:3181:b0:55c:d503:764c with SMTP id di1-20020a056402318100b0055cd503764cmr306763edb.22.1706677687854; Tue, 30 Jan 2024 21:08:07 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> In-Reply-To: <20240130205710.11cf19cf@slippy> From: Warner Losh Date: Tue, 30 Jan 2024 22:07:56 -0700 Message-ID: Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 To: Cy Schubert Cc: Jessica Clarke , Jung-uk Kim , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000054b556061036dd0f" X-Rspamd-Queue-Id: 4TPqmq2ZMcz4bPM X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --00000000000054b556061036dd0f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Jan 30, 2024, 9:57=E2=80=AFPM Cy Schubert wrote: > On Wed, 31 Jan 2024 04:29:18 +0000 > Jessica Clarke wrote: > > > On 31 Jan 2024, at 04:06, Jung-uk Kim wrote: > > > > > > The branch main has been updated by jkim: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D722b16673c40aedf280895f2f2f676b= b494518d7 > > > > > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > > > Author: Jung-uk Kim > > > AuthorDate: 2024-01-30 21:43:45 +0000 > > > Commit: Jung-uk Kim > > > CommitDate: 2024-01-31 03:16:36 +0000 > > > > > > acpica: Import ACPICA 20230331 > > > > > > (cherry picked from commit > 8e013e1e3b81740266738226667431cf5c28b17a) > > > > Cherry-pick not merge for a vendor merge?.. > > Probably not Kosher but, a general git question about cherry-picks vs > merges. A cherry-pick, without the -x but specifying the source branch, > results in no cherry picked merge but a merge of the last commit of the > source branch to the current branch. > > Can someone explain this? And if this would be any different from a > merge from a branch that is ahead by one commit since the last merge? > This is functionally identical in the resulting tree, except only one parent is recorded for the commit. If there were no fixups needed, the next merge would automatically skip the cherry-picked commit due the commit hashes matching. However if fixups were needed, there may be conflicts on the next merge in cases I can only hand wave about, but have hit once or twice. A merge seems to be better because it only looks at changes since the last common ancestor. I think a merge would handle the need to revert better, though my experience with awk is making me question that. Warner --=20 > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > --00000000000054b556061036dd0f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Jan 30, 2024, 9:57=E2=80=AFPM Cy Schubert <= Cy.Schubert@cschubert.com&= gt; wrote:
On Wed, 31 Jan 2024 04:2= 9:18 +0000
Jessica Clarke <jrtc27@freebsd.org> wrote:

> On 31 Jan 2024, at 04:06, Jung-uk Kim <jkim@FreeBSD.org> wrote:<= br> > >
> > The branch main has been updated by jkim:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D722b16673c40aedf280895f2f= 2f676bb494518d7
> >
> > commit 722b16673c40aedf280895f2f2f676bb494518d7
> > Author:=C2=A0 =C2=A0 =C2=A0Jung-uk Kim <jkim@FreeBSD.org> > > AuthorDate: 2024-01-30 21:43:45 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Jung-uk Kim <jkim@FreeBSD.org> > > CommitDate: 2024-01-31 03:16:36 +0000
> >
> >=C2=A0 =C2=A0 acpica: Import ACPICA 20230331
> >
> >=C2=A0 =C2=A0 (cherry picked from commit 8e013e1e3b817402667382266= 67431cf5c28b17a)=C2=A0
>
> Cherry-pick not merge for a vendor merge?..

Probably not Kosher but, a general git question about cherry-picks vs
merges. A cherry-pick, without the -x but specifying the source branch,
results in no cherry picked merge but a merge of the last commit of the
source branch to the current branch.

Can someone explain this? And if this would be any different from a
merge from a branch that is ahead by one commit since the last merge?

This i= s functionally identical in the resulting tree, except only one parent is r= ecorded for the commit. If there were no fixups needed, the next merge woul= d automatically skip the cherry-picked commit due the commit hashes matchin= g. However if fixups were needed, there may be conflicts on the next merge = in cases I can only hand wave about, but have hit once or twice. A merge se= ems to be better because it only looks at changes since the last common anc= estor. I think a merge would handle the need to revert better, though my ex= perience with awk is making me question that.

Warner

--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 ht= tps://FreeBSD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2= =A0 Web:=C2=A0 https://nwtime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0
--00000000000054b556061036dd0f--