From nobody Fri Jun 04 02:28:18 2021 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 652181370431 for ; Fri, 4 Jun 2021 02:28:30 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fx6Bk2Jl2z3QVK for ; Fri, 4 Jun 2021 02:28:30 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-ot1-f53.google.com with SMTP id t10-20020a05683022eab0290304ed8bc759so7692751otc.12 for ; Thu, 03 Jun 2021 19:28:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hD9so8l3ukp9C4ubRZ3q/tImaMnhWOOLsITVI/7w3NU=; b=XT04GqHUUBhorko4YpNKOiwADfAN7cd6dWwLk4uL1vp0VbB7kdjXtQotqifNf0CDRp fXXcFhSzMpAUPPIYUNpOPD1QbpFg0Erhh/tnVinFvRpat//vb52rsWQ1uyhUkWBzJ4BH RukBzfAiw04wNY6MYOCaCmriDEoOJqot3ZwQSfJfnUUGvHiYsF9tT5sY/mqOHvJKUUOr 5/chC32Ed8SAvlhca1rNByXlr4g5v1VvpflPKlnNlydCFb7w3sLxzafIzFL1U4iqrf9P H0c4vngohaJbX4YCr5C9l9aaptLku8cwOYeB8mXDu4bhK6g91vtK7hB7BKiKq5CloDey YLTg== X-Gm-Message-State: AOAM531TJkAyMkhKVZZRxmnK0MXEndXfk0Qp1JIFnCIDd5Gly1t49pCG X/MzEQeKBgx35zGK3xAA/UMYT4sI+sZVJrIrYGM= X-Google-Smtp-Source: ABdhPJyvcttTb2bfMeRBPDUFOI3hyak6nB14DlxeUeewDiHsaw5NrIfzTiOMTHYJkvecYt/j1XvO9ZubfckEGuWKTzE= X-Received: by 2002:a9d:5e8c:: with SMTP id f12mr1908021otl.18.1622773709207; Thu, 03 Jun 2021 19:28:29 -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: Alan Somers Date: Thu, 3 Jun 2021 20:28:18 -0600 Message-ID: Subject: Re: git MFC/cherry-pick question To: Rick Macklem Cc: FreeBSD Current Content-Type: multipart/alternative; boundary="0000000000007cfb1b05c3e772ab" X-Rspamd-Queue-Id: 4Fx6Bk2Jl2z3QVK X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: Y --0000000000007cfb1b05c3e772ab Content-Type: text/plain; charset="UTF-8" On Thu, Jun 3, 2021 at 8:13 PM Rick Macklem wrote: > Hi, > > I am trying to MFC a commit to stable/12. > The cherry-pick works, but the resultant code > is not correct and won't build. > --> I broke the build yesterday and manually > reverted the breakage. > > So, how do I do this? > > Do I have to manually edit the file after the > cherry-pick and then do something like a > git commit -a > to get the edited change in, or is there a > way to tell it to add it to the cherry-pick or ?? > > Thanks anyone, for help with this, rick > Is the resulting code incorrect because of a git merge error, or because stable/13 requires slightly different code than main? If it's the latter, then after the "git cherry-pick", you should edit the file manually and do a "git commit -a --amend". That will produce the right result. You don't have to worry about screwing up merge history by using "--amend", because "git cherry-pick" already screws up merge history. If your problem is the former, then the same solution will work, although you might be able to solve it by using some fancy git merge options instead. -Alan --0000000000007cfb1b05c3e772ab--