From nobody Wed May 17 16:44:11 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 4QLzTg3Xt0z4BLRT for ; Wed, 17 May 2023 16:44:23 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (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 4QLzTf377fz41GL for ; Wed, 17 May 2023 16:44:22 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=aL527Dfz; spf=pass (mx1.freebsd.org: domain of rick.macklem@gmail.com designates 2607:f8b0:4864:20::1030 as permitted sender) smtp.mailfrom=rick.macklem@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-253520adb30so262000a91.1 for ; Wed, 17 May 2023 09:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684341861; x=1686933861; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=SA3xcBKcFFgbdSzGLM9qUSTzK+mjjYnPjPPY4TxN8/w=; b=aL527DfzKxCPexViQpeAuoKCSRrKE1N6cloMOxBGuWLUdWA1Bh8Cg5dma++J81WEdZ ZoLS8HT3SdwYec8XHFv1ZF5BuhUJMH6SRMa8Vffy4BkP/Uq3GEUVFamfxJyfKUafUzcl su6AwF5gU8Ssph2MXIudR16t8qfdmeDkT1+b1Sag0L2eLyWs07XjiFtrINGSAqxMa6V0 sJUR/v9GDi7gOlYNA1sKYcXLLy4pBpPhF9H9wSmoD6iGF2Nfv2iuoPolZBkl00To+8Q0 SnuvPuZStI7YjVPj/1VaiiEGagl1eBTp0ZvH70XliOvmvVORwfESFDYk6ShF47+gctiF TTWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684341861; x=1686933861; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SA3xcBKcFFgbdSzGLM9qUSTzK+mjjYnPjPPY4TxN8/w=; b=jYAnoZsZZegbh9hBjFQ8eE8uOgeMummMsHzVr+meQChCKOLI9YJuwBho1rIjuJDh1S VUb3Rz2fNK8NEwRqPAEdS8fHbV5tHEm2V2+bFfLfHEMRl4KdefwEH9b4gX9PZXvNi1dc 7e1/LkGs85sbdQREpeS6JqMaLlOaMUshjIvB+J0CLuBVne7MsWrM253PkO/mW5cPWCtA g6VyH9964mcXijh6AFDo3SWcTvUUFPfufLzoIsveEaHrmRnMt6M+/1hwN7me+at2GdFK SdLxXgJrkxTFgCAwuI4H1+XNDdDgQt2uthcX7l5KU1O6EvJWLeL9NsUbIppaAkH7QT51 Y0Ug== X-Gm-Message-State: AC+VfDxNcevZTb/yGhaUk178rMyj4h+ASxtMXgMFZrF4uYrX8q+UPnzj pU36EH67/cIlmrSSAx1jm6zp/ibD89r1ormbEgB9M4vs2A== X-Google-Smtp-Source: ACHHUZ5K6UfGBuX4wFMQpQT3Yaxq3G0l8NoDCtN9e1NrIvFzNLgG3qdDOkIJ274hErH9glfqmkX6BrjjnV4pBjCdjxk= X-Received: by 2002:a17:90a:f188:b0:253:29ac:4fef with SMTP id bv8-20020a17090af18800b0025329ac4fefmr263923pjb.26.1684341861062; Wed, 17 May 2023 09:44:21 -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 From: Rick Macklem Date: Wed, 17 May 2023 09:44:11 -0700 Message-ID: Subject: what do I do when git cherry-pick works, but results are bogus? To: FreeBSD CURRENT Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-2.93 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-1.00)[-0.997]; NEURAL_HAM_SHORT(-0.93)[-0.931]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1030:from]; FREEMAIL_FROM(0.00)[gmail.com]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; DKIM_TRACE(0.00)[gmail.com:+]; TO_DN_ALL(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4QLzTf377fz41GL X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N 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".) Thanks for any help with this, rick