Date: Wed, 31 Jan 2024 09:49:59 -0500 From: Ed Maste <emaste@freebsd.org> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Warner Losh <imp@bsdimp.com>, 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: <CAPyFy2D=-D_eJW=GJCKThrw%2BJpuU=w2x-5KkarBmQg40SDc0EQ@mail.gmail.com> In-Reply-To: <20240131051743.EDDE915B@slippy.cwsent.com> References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> <CANCZdfr_kWeBKH5bpWRs6XPUQfbikow8MK%2B3edmDVse7j_QsOQ@mail.gmail.com> <20240131051743.EDDE915B@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 31 Jan 2024 at 00:17, Cy Schubert <Cy.Schubert@cschubert.com> wrote:
>
> but would the history graph be different? Or does that matter?
It will be different - a merge would be
main --- A --- B ---- C ---- D
/ /
/ /
vendor --- X ------------ Y
cherry-pick will be:
main --- A --- B ---- C ---- D'
/
/
vendor --- X ------------ Y
as you mention D and D' have the same contents, but D' has only one
parent. When searching for unmerged changes commit Y might be
reported, but that view of the history won't otherwise cause material
issues.
If there's another update in the future and it's merged we'll be back to:
main --- A --- B ---- C ---- D' --- E
/ /
/ /
vendor --- X ------------ Y ---- Z
In this case Y would no longer get reported as needing to be merged.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2D=-D_eJW=GJCKThrw%2BJpuU=w2x-5KkarBmQg40SDc0EQ>