From nobody Wed May 17 17:41:33 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 4QM0lk0BSYz4BPVq for ; Wed, 17 May 2023 17:41:38 +0000 (UTC) (envelope-from bounces+3941489-af3c-freebsd-current=freebsd.org@sg.funkyhat.org) Received: from s.wrqvtbkv.outbound-mail.sendgrid.net (s.wrqvtbkv.outbound-mail.sendgrid.net [149.72.123.24]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QM0lf6DFZz478X for ; Wed, 17 May 2023 17:41:34 +0000 (UTC) (envelope-from bounces+3941489-af3c-freebsd-current=freebsd.org@sg.funkyhat.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=funkyhat.org header.s=s1 header.b=a6XwbtNy; spf=pass (mx1.freebsd.org: domain of "bounces+3941489-af3c-freebsd-current=freebsd.org@sg.funkyhat.org" designates 149.72.123.24 as permitted sender) smtp.mailfrom="bounces+3941489-af3c-freebsd-current=freebsd.org@sg.funkyhat.org"; dmarc=pass (policy=none) header.from=funkyhat.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=funkyhat.org; h=mime-version:references:in-reply-to:from:subject:to:cc:content-type: cc:content-type:from:subject:to; s=s1; bh=KhWaqNR797v0XXtHDOOkihJid8rpUDKjne7hhdtVA8Q=; b=a6XwbtNy0tk1gOs39F1Ku2lSnTjavtoOZPp94fe+ouamrjHf5w2C0gCTxNC/TxOA6L7w u58qBP6ByjNLpFKjJSuFyz5G6VjsxT9FM+Kp4is6CnHzm6Dz0jOrBC5bOXOdATmS/ngcWA CySmPUeH24LQTBgEeNKoyY7SPG//xEc65T2ngnrQXxjZd4kIfPqoZ321GMrrpDoTh3I5zf dI4TgZOsHTmqmo6a6gor685qWBtA8JGTySV3au9UMZDrPxcVQ+xlwBZal4/Oib5mNf6Zpw xFftgpKEzxhAgJwaUzUodZgUxYOOfCt4UHGd+gz+zhh7h4v53Az/CFtDIikK9kOw== Received: by filterdrecv-84b96456cb-6l8hp with SMTP id filterdrecv-84b96456cb-6l8hp-1-646511CD-2 2023-05-17 17:41:33.044183971 +0000 UTC m=+583383.639593539 Received: from mail-oa1-f54.google.com (unknown) by geopod-ismtpd-4 (SG) with ESMTP id xN-eqJMOSnuJ_QbYXPVWaw for ; Wed, 17 May 2023 17:41:32.812 +0000 (UTC) Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-199bffcfd21so426071fac.1 for ; Wed, 17 May 2023 10:41:32 -0700 (PDT) X-Gm-Message-State: AC+VfDzPT0yp51UeaDjv2cFiN0Ue8CwDF+p7JrauYtjLUAd+NzkSaqW7 fuGXwmG9a97nphhdRtDjauIhBIJGKB/rTutPxN4= X-Google-Smtp-Source: ACHHUZ4hzQGHsquovzHkSNh4UfVCPLQ9wXeYNimENC+Ez6WSCKq0LrV+Yycksf6jg28qBFMSjBaRra6fKtp/MflAF44= X-Received: by 2002:a05:6871:6a9d:b0:191:d6cd:6f5b with SMTP id zf29-20020a0568716a9d00b00191d6cd6f5bmr15975307oab.22.1684345291789; Wed, 17 May 2023 10:41:31 -0700 (PDT) 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 References: In-Reply-To: From: Matt Wheeler Date: Wed, 17 May 2023 17:41:33 +0000 (UTC) X-Gmail-Original-Message-ID: Message-ID: Subject: Re: what do I do when git cherry-pick works, but results are bogus? X-SG-EID: =?us-ascii?Q?0Inp6eTONCzyoELeI1sebU20s7oV+PGDJ0XSMeDXt7Ds=2FXkTGJvbLHoLdmgoAX?= =?us-ascii?Q?zpzis4KsAGGwDcdN8D4Uag=2FWzegu1qH1r2tkWs=2F?= =?us-ascii?Q?Ydpd4u20DCAjynaPNt8PV2Kq7ofJ6TkDz+oKhgb?= =?us-ascii?Q?VxnzFx0PCR8+25f=2FucFX4B47NRGnMuI+M5X8kty?= =?us-ascii?Q?NWAA+Pn40Tkgtny1mnDyydemxelth8qLOhmopz9?= =?us-ascii?Q?cRLO466F85GnSgorNg=2FeynE7B6oqwLb1IU36BO?= To: Rick Macklem Cc: FreeBSD CURRENT X-Entity-ID: MS20PS1i4aZzj2VHRP27Gw== Content-Type: multipart/alternative; boundary="000000000000cbdd5205fbe73286" X-Spamd-Result: default: False [0.92 / 15.00]; RBL_SENDERSCORE(2.00)[149.72.123.24:from]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.38)[-0.377]; FORGED_SENDER(0.30)[m@funkyhat.org,bounces@sg.funkyhat.org]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; R_DKIM_ALLOW(0.00)[funkyhat.org:s=s1]; BLOCKLISTDE_FAIL(0.00)[149.72.123.24:server fail]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; TAGGED_FROM(0.00)[3941489-af3c-freebsd-current=freebsd.org]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; DKIM_TRACE(0.00)[funkyhat.org:+]; RCPT_COUNT_TWO(0.00)[2]; TO_DN_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; FROM_NEQ_ENVFROM(0.00)[m@funkyhat.org,bounces@sg.funkyhat.org]; DMARC_POLICY_ALLOW(0.00)[funkyhat.org,none]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; ASN(0.00)[asn:11377, ipnet:149.72.112.0/20, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_SPF_ALLOW(0.00)[+ip4:149.72.0.0/16] X-Rspamd-Queue-Id: 4QM0lf6DFZz478X X-Spamd-Bar: / X-ThisMailContainsUnwantedMimeParts: N --000000000000cbdd5205fbe73286 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit On Wed, 17 May 2023, 17:44 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".) > If you're cherry-picking multiple commits then you can turn the problem into a rebase After the cherry-pick commits are created, then run git rebase -i Then change the `i` at the start of the line for the broken commit to `e` (edit) before saving the plan file --000000000000cbdd5205fbe73286 Content-Type: text/html; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable
On Wed, 17 May 2023, 17:44 Rick Macklem, <rick.macklem@gmail.com> 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<= br> correct. What do I do to fix this?
(If the merge fails, then it's easy, but there doesn't seem to be a= n option
=A0on cherry-pick that forces it into "merge failed", so you can = edit/add the file
=A0and then "git cherry-pick --continue".)
=

If you're cherry-pi= cking multiple commits then you can turn the problem into a rebase=A0
=

After the cherry-pick commits= are created, then run=A0

=A0 git rebase -i <ref your branch is based on>

Then change the `i` at the start of the lin= e for the broken commit to `e` (edit) before saving the plan file=A0
<= div dir=3D"auto">
--000000000000cbdd5205fbe73286--