From owner-freebsd-git@freebsd.org Fri Jan 1 17:26:30 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 150D44CE8B5 for ; Fri, 1 Jan 2021 17:26:30 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D6sPy06Dhz3Mnt for ; Fri, 1 Jan 2021 17:26:30 +0000 (UTC) (envelope-from mr@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 01D104CEC1C; Fri, 1 Jan 2021 17:26:30 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 019C84CEC1A for ; Fri, 1 Jan 2021 17:26:30 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6sPx6gjzz3N1n; Fri, 1 Jan 2021 17:26:29 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from mypower.rm-i.net (ipbcc0fd0a.dynamic.kabel-deutschland.de [188.192.253.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: mr) by smtp.freebsd.org (Postfix) with ESMTPSA id 7C44F2CC94; Fri, 1 Jan 2021 17:26:29 +0000 (UTC) (envelope-from mr@freebsd.org) Date: Fri, 01 Jan 2021 18:26:30 +0100 User-Agent: K-9 Mail for Android In-Reply-To: References: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: MFC changes for stable/11 error To: Ed Maste ,MR CC: git@freebsd.org From: Michael Message-ID: <40A9FFE2-171F-4382-A296-BCDB6A8ED41B@freebsd.org> X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2021 17:26:30 -0000 Hi, Am 31=2E Dezember 2020 19:35:06 MEZ schrieb Ed Maste : >On Thu, 31 Dec 2020 at 13:10, MR wrote: >> >> error: could not apply a70af2507f72=2E=2E=2E MFC r340361, r345804: catc= h up >> on systat in head/ >> hint: after resolving the conflicts, mark the corrected paths >> hint: with 'git add ' or 'git rm ' >> hint: and commit the result with 'git commit' > >This is presumably just because there are additional changes that were >merged to stable/12 and not stable/11=2E > >kevans' "MFC -fno-common fixes" commit is: > >stable/11 e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb >stable/12 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 > >as you mentioned this is the most recent usr=2Ebin/systat commit in >stable/11, while there are three additional changes in stable/12 in >usr=2Ebin/systat after that one=2E But if we compare usr=2Ebin/systat at >those two hashes we see: > >$ git diff --stat e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb >9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 usr=2Ebin/systat > usr=2Ebin/systat/Makefile | 2 +- > usr=2Ebin/systat/Makefile=2Edepend | 1 - > usr=2Ebin/systat/cmds=2Ec | 4 +++- >=2E=2E=2E > 25 files changed, 234 insertions(+), 152 deletions(-) > >So the failure from `git cherry-pick -x` is just a patch conflict, the >same as would occur trying to merge those three commits in SVN=2E > >$ git cherry-pick -x a70af2507f720c2d7f56f51a18d358123b4770a5 >=2E=2E=2E >error: could not apply a70af2507f72=2E=2E=2E MFC r340361, r345804: catch = up >on systat in head/ >hint: after resolving the conflicts, mark the corrected paths >hint: with 'git add ' or 'git rm ' >hint: and commit the result with 'git commit' > >As with svn you can edit the conflicting files and then commit the >result - or, cherry-pick the other changes that are missing from >stable/11 if appropriate=2E > >It seems two files conflicted: >usr=2Ebin/systat/vmstat=2Ec >usr=2Ebin/systat/zarc=2Ec >the conflict in the former can be resolved automatically; for zarc=2Ec >you can check what's merged to stable/12: > >% git log =2E=2Efreebsd/stable/12 usr=2Ebin/systat/zarc=2Ec > >Looking through the commits it seems at least >45e9405ea4b05926b22a743237cbfe918206db50 was not merged and is >responsible for at least one of the conflicts=2E --=20 Michael