From nobody Wed Jan 31 22:39:14 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 4TQH5f4hw9z58Rx2; Wed, 31 Jan 2024 22:39:18 +0000 (UTC) (envelope-from glebius@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQH5f45bDz42QB; Wed, 31 Jan 2024 22:39:18 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706740758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N+ej5MVQWw51OL6GstZvnJ1knyLMV03SNlVSzesW3Ss=; b=XfiVYqF7j4E2B10VapkWx3UzcgE+LrCXMkCClR36Uaf4VHa7kqoA+umei2hadmEJxxpaS/ xqeaej3DNS5YOvKCxz+OT5cORF3ck98masZ+f5H8l/xGz4erJCflzEIMFVYWQK61NR+tE+ vjSPoOgltN+M8bbwzaDi3UVjbxK1Z8iJpO6N2IUDwUwEey2Q5j0G9OPeKqe0RI5g7D5Xc0 /UudOUGMqB/ollROr5D3Ss+MO2SEvI8v0S27uD1+FuOhZoc+56x9xAqNOR948sJz/3lFlC TIf5wLkrphPRHYC1Q5pnGcj+mhpj21u9aMcnKpbzobK3hQ8/08f99Bh4Y7CP2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706740758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N+ej5MVQWw51OL6GstZvnJ1knyLMV03SNlVSzesW3Ss=; b=utc7GjmhwnAWnaoeauEtsJswjWYRmtl7v+GWCl6l18lunqbez2o2L9MXIsC8XwZGbGeyoe G93NRO2SC9Jnti2zYdD6w56QkdHdhgZG99uh05ze6odPieXTMe3jnwBk3h2/jL6F+Bpme9 dxmvhB/ijsd9WcmnIXkpLVIHb3boXeS4XghvKft26ywlpq3TIwiOWcV/KbStZ7E6LElREu KzlPc5OH7vJZPUkX6x1pQ0cxrs5qDRyrO+ErtcPEQbkmelBcw8oG3pqwt+GCKvA2liG5tb nfh7LaQs+1SbyqFB57ZVawg8SdJWoLr+RpNY2FcvqziKMNoqYx+SrKwfE0zeyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706740758; a=rsa-sha256; cv=none; b=QrPzTm83yw1EEDjkqOzOpcPDC88zzAaGMXm4f1n3A4QctV5cc0TDegz2UcVTb195Eymgwf eU2sVV85jBmwFn5LurJDn8OuVLRD8GhJHZdia+z3bJdXDtwHySoLmCTwCQW1LY4Q/JQSpo YbbEmw6pZr1gfzpUYuEJDL2QqOarObwugNJ6CL9vagdR4tAIt/QvUbEwCqSqpbdeDoW1Rk SNwpfTgM6/7cFkYzkfYmm3oIBA6Xd0VG4GDiP0APYtyDLUjBxxJ2F47D2wimvfZX5VsA0j n0oZSgONXj+SJeQkz7EzJIH3Ix86JUry8giTaN9Om0+ADmSNf4XvkBMei09lHg== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQH5d3xKLz15GX; Wed, 31 Jan 2024 22:39:17 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Wed, 31 Jan 2024 14:39:14 -0800 From: Gleb Smirnoff To: Cy Schubert Cc: Jessica Clarke , Jung-uk Kim , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 Message-ID: References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240130205710.11cf19cf@slippy> On Tue, Jan 30, 2024 at 08:57:10PM -0800, Cy Schubert wrote: C> > > commit 722b16673c40aedf280895f2f2f676bb494518d7 C> > > Author: Jung-uk Kim C> > > AuthorDate: 2024-01-30 21:43:45 +0000 C> > > Commit: Jung-uk Kim C> > > CommitDate: 2024-01-31 03:16:36 +0000 C> > > C> > > acpica: Import ACPICA 20230331 C> > > C> > > (cherry picked from commit 8e013e1e3b81740266738226667431cf5c28b17a) C> > C> > Cherry-pick not merge for a vendor merge?.. C> C> Probably not Kosher but, a general git question about cherry-picks vs C> merges. A cherry-pick, without the -x but specifying the source branch, C> results in no cherry picked merge but a merge of the last commit of the C> source branch to the current branch. C> C> Can someone explain this? And if this would be any different from a C> merge from a branch that is ahead by one commit since the last merge? The object hashes would be the same, but the second parent meta-data is basically lost, although can be recorded in the commit text message with -x. The second parent is important. When searching for regressions you may go into bisecting the acpica history instead of FreeBSD history once you figured out that this is the merge that brough the regression. With second parent this can be automated and in case of manual search still easier to do. So, please don't do cherry-picks instead of merges for vendor subprojects. -- Gleb Smirnoff