From nobody Sat May 20 03:19:43 2023 X-Original-To: freebsd-current@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 4QNTVF5tcfz4BTPM for ; Sat, 20 May 2023 03:20:05 +0000 (UTC) (envelope-from pat@patmaddox.com) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QNTVD4yK8z4JSc for ; Sat, 20 May 2023 03:20:04 +0000 (UTC) (envelope-from pat@patmaddox.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=patmaddox.com header.s=fm3 header.b=bKnGeswH; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=C8mYDGc0; spf=pass (mx1.freebsd.org: domain of pat@patmaddox.com designates 66.111.4.25 as permitted sender) smtp.mailfrom=pat@patmaddox.com; dmarc=none Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 1D1FD5C034D; Fri, 19 May 2023 23:20:04 -0400 (EDT) Received: from imap41 ([10.202.2.91]) by compute2.internal (MEProxy); Fri, 19 May 2023 23:20:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=patmaddox.com; h=cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1684552804; x=1684639204; bh=xe SSpl0btAUbN3cht01UrD8h+2MBKGy1IS0c/pO3RCo=; b=bKnGeswHo8JjPQJg5p bvxlaKyhYtZqMxIb0ibkqDOQwgfcMZgWwrjwk1KDxF2WRj7GSZly/LLiYgXTbkbd vTzMJxLjAMpvCM18P/zGl+BchPtk5RLpeNfOyDRuyzYU6nUXHTUbqn3QXlK5j1PY ua1t8MUpH3Lf6JK3A3LkWDKHXtrFWEqLzCo/T1rKxI19RPkBg8AJcSaamtKjYgjN wkIK55jgnw7mTUw1bCk89PjFRIcQ13lWqcsK5qP25XBsDlr+hQvzPaSEsCOnPmBS nSy49+VllwKW3Tg50CgP6vpcorUUG2oj4ktpODD2xc8izv9eVVOVdrX33ZVz3Atk z0jg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1684552804; x=1684639204; bh=xeSSpl0btAUbN 3cht01UrD8h+2MBKGy1IS0c/pO3RCo=; b=C8mYDGc0QGc3gd4+j7hkOI3/rUtFi Tqt2BK5Xnm3ayBbR5+JoOKhubS9UR+QPYfNtPyOcOv4a1VVOhSPrwzqwfALkAk4S bRgduCGBkNWLDdSnX2jZ4yHUNK3jk7Od8f5EVm1Wqmszj+sZguyd8UfGD4m+2tZb l93CIiaI1PjlV3Ify4H5ndFq2oyRrvvAmo6Zp4UWBlTP6iwQ1pTEihtQn7bPZU9M hryfNT8cpxa41sdv04MgMOCrZJDZ6HfWHyxRDDN6fhROXJstpFZSW34hpzL/HYJ/ Co2hdJsoSlon39ZE3S5n8fx4nTjA+9MvErF6pRh4ST7kCbIVfDU6r5ezw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeeiiedgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtsehttd ertderredtnecuhfhrohhmpedfrfgrthcuofgrugguohigfdcuoehprghtsehprghtmhgr ugguohigrdgtohhmqeenucggtffrrghtthgvrhhnpeehueetudekveeljefghfduleekvd fhieeljeevhfekiefhgedtleelgfekhfelueenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehprghtsehprghtmhgrugguohigrdgtohhm X-ME-Proxy: Feedback-ID: i8b6c40f9:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id D8E54234007B; Fri, 19 May 2023 23:20:03 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-431-g1d6a3ebb56-fm-20230511.001-g1d6a3ebb List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org Mime-Version: 1.0 Message-Id: <2b26b6ec-54b2-46be-9ae0-157a839b76fd@app.fastmail.com> In-Reply-To: References: Date: Fri, 19 May 2023 20:19:43 -0700 From: "Pat Maddox" To: freebsd-current@freebsd.org Subject: Re: what do I do when git cherry-pick works, but results are bogus? Content-Type: text/plain X-Spamd-Result: default: False [-3.16 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.97)[-0.974]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[patmaddox.com:s=fm3,messagingengine.com:s=fm1]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.25]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_GOOD(-0.10)[66.111.4.25:from]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.25:from]; XM_UA_NO_VERSION(0.01)[]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[patmaddox.com:+,messagingengine.com:+]; DMARC_NA(0.00)[patmaddox.com]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEFALL_USER(0.00)[pat]; BLOCKLISTDE_FAIL(0.00)[66.111.4.25:server fail]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org] X-Rspamd-Queue-Id: 4QNTVD4yK8z4JSc X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On Wed, May 17, 2023, at 9:44 AM, Rick Macklem wrote: > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are not > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't seem to be an option > on cherry-pick that forces it into "merge failed", so you can edit/add the file > and then "git cherry-pick --continue".) git cherry-pick --no-commit ?