From nobody Wed Jan 31 14:49:59 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 4TQ4hQ5sHJz58gXq; Wed, 31 Jan 2024 14:50:14 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 4TQ4hQ2PGxz41Fv; Wed, 31 Jan 2024 14:50:14 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2cf1288097aso69864651fa.0; Wed, 31 Jan 2024 06:50:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706712612; x=1707317412; 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=VfoAgaJ/xYC2RMlxz/5r6/hwzqOS7ZX364TvkjMv39E=; b=jDUJRzLaqsPduMcUNSgxrClYB/D3Chnn83pxR42uPnM9gRF96cwr5f6VNMtJgKI/lp wtI6geXUO5WxlZvtBy7Tdyi+lGS2x6tfjNUoAHQ0Q/yw1atM3rT4piA2zKl0uSVVdkPo QWJ1LPHRwTP7ZFJN3liIBwH7p569XFK4Cu2mYRBRDJsP1cgkSmEwHw9lPOLrDtD/z4Lm uUn88XzP7fXX+EdrpguzQ0lbLUqdnVTcx44wWK2pBs8EQ4e1kM/ulfpUgv78450Tf85d CzPVHXi8CgpmmS6Tr2hefUenqVI7i2qSwI8Kz9qoTgWWFTMxLhkmkVUXPtjQkabTxyVW 91Pg== X-Gm-Message-State: AOJu0YyKyHVZCtyiSUmPVoQmgxptWJ7ust0CK3xZGKznSw9JFmbnwv8j DDUIIM2ny9YP+b8hct7XIzZSOefLzBs1V9ilztlc5NKS0dWBtrlo3Z3ZetbGcyodie4BcJIdF/6 cK7Anr4YGzTrie6WuBpCm833Nd9U= X-Google-Smtp-Source: AGHT+IG0SetDs/jDJd0eWRIgS26LjWLPPnNpVbgO+Br/EPC/W+nuH0Z7bdJ5cBbT4aCsqMQnHxT/b1WwywnZnSct5vg= X-Received: by 2002:a2e:950c:0:b0:2d0:4ef8:3472 with SMTP id f12-20020a2e950c000000b002d04ef83472mr1287550ljh.47.1706712612075; Wed, 31 Jan 2024 06:50:12 -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> <20240131051743.EDDE915B@slippy.cwsent.com> In-Reply-To: <20240131051743.EDDE915B@slippy.cwsent.com> From: Ed Maste Date: Wed, 31 Jan 2024 09:49:59 -0500 Message-ID: Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 To: Cy Schubert Cc: Warner Losh , Jessica Clarke , Jung-uk Kim , src-committers , "" , "" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4TQ4hQ2PGxz41Fv 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:209.85.128.0/17, country:US] On Wed, 31 Jan 2024 at 00:17, Cy Schubert 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.