Date: Tue, 30 Jan 2024 22:07:56 -0700 From: Warner Losh <imp@bsdimp.com> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Jessica Clarke <jrtc27@freebsd.org>, Jung-uk Kim <jkim@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 Message-ID: <CANCZdfr_kWeBKH5bpWRs6XPUQfbikow8MK%2B3edmDVse7j_QsOQ@mail.gmail.com> In-Reply-To: <20240130205710.11cf19cf@slippy> References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Tue, Jan 30, 2024, 9:57 PM Cy Schubert <Cy.Schubert@cschubert.com> wrote: > On Wed, 31 Jan 2024 04:29:18 +0000 > Jessica Clarke <jrtc27@freebsd.org> wrote: > > > On 31 Jan 2024, at 04:06, Jung-uk Kim <jkim@FreeBSD.org> wrote: > > > > > > The branch main has been updated by jkim: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=722b16673c40aedf280895f2f2f676bb494518d7 > > > > > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > > > Author: Jung-uk Kim <jkim@FreeBSD.org> > > > AuthorDate: 2024-01-30 21:43:45 +0000 > > > Commit: Jung-uk Kim <jkim@FreeBSD.org> > > > 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 -- > Cheers, > Cy Schubert <Cy.Schubert@cschubert.com> > FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org > NTP: <cy@nwtime.org> Web: https://nwtime.org > > e^(i*pi)+1=0 > [-- Attachment #2 --] <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jan 30, 2024, 9:57 PM Cy Schubert <<a href="mailto:Cy.Schubert@cschubert.com">Cy.Schubert@cschubert.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Wed, 31 Jan 2024 04:29:18 +0000<br> Jessica Clarke <<a href="mailto:jrtc27@freebsd.org" target="_blank" rel="noreferrer">jrtc27@freebsd.org</a>> wrote:<br> <br> > On 31 Jan 2024, at 04:06, Jung-uk Kim <jkim@FreeBSD.org> wrote:<br> > > <br> > > The branch main has been updated by jkim:<br> > > <br> > > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=722b16673c40aedf280895f2f2f676bb494518d7" rel="noreferrer noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=722b16673c40aedf280895f2f2f676bb494518d7</a><br>; > > <br> > > commit 722b16673c40aedf280895f2f2f676bb494518d7<br> > > Author: Jung-uk Kim <jkim@FreeBSD.org><br> > > AuthorDate: 2024-01-30 21:43:45 +0000<br> > > Commit: Jung-uk Kim <jkim@FreeBSD.org><br> > > CommitDate: 2024-01-31 03:16:36 +0000<br> > > <br> > > acpica: Import ACPICA 20230331<br> > > <br> > > (cherry picked from commit 8e013e1e3b81740266738226667431cf5c28b17a) <br> > <br> > Cherry-pick not merge for a vendor merge?..<br> <br> Probably not Kosher but, a general git question about cherry-picks vs<br> merges. A cherry-pick, without the -x but specifying the source branch,<br> results in no cherry picked merge but a merge of the last commit of the<br> source branch to the current branch.<br> <br> Can someone explain this? And if this would be any different from a<br> merge from a branch that is ahead by one commit since the last merge?<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">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.</div><div dir="auto"><br></div><div dir="auto">Warner</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> -- <br> Cheers,<br> Cy Schubert <<a href="mailto:Cy.Schubert@cschubert.com" target="_blank" rel="noreferrer">Cy.Schubert@cschubert.com</a>><br> FreeBSD UNIX: <cy@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer noreferrer" target="_blank">https://FreeBSD.org</a><br>; NTP: <<a href="mailto:cy@nwtime.org" target="_blank" rel="noreferrer">cy@nwtime.org</a>> Web: <a href="https://nwtime.org" rel="noreferrer noreferrer" target="_blank">https://nwtime.org</a><br>; <br> e^(i*pi)+1=0<br> </blockquote></div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfr_kWeBKH5bpWRs6XPUQfbikow8MK%2B3edmDVse7j_QsOQ>