Date: Fri, 01 Jan 2021 18:26:30 +0100 From: Michael <mr@freebsd.org> To: Ed Maste <emaste@freebsd.org>,MR <mr@freebsd.org> Cc: git@freebsd.org Subject: Re: MFC changes for stable/11 error Message-ID: <40A9FFE2-171F-4382-A296-BCDB6A8ED41B@freebsd.org> In-Reply-To: <CAPyFy2D78nozzgQecho-8u6cbEB12z3FWy0WWuPFx9KsOaZ=PQ@mail.gmail.com> References: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> <CAPyFy2D78nozzgQecho-8u6cbEB12z3FWy0WWuPFx9KsOaZ=PQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi, Am 31=2E Dezember 2020 19:35:06 MEZ schrieb Ed Maste <emaste@freebsd=2Eorg= >: >On Thu, 31 Dec 2020 at 13:10, MR <mr@freebsd=2Eorg> 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 <paths>' or 'git rm <paths>' >> 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 <paths>' or 'git rm <paths>' >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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?40A9FFE2-171F-4382-A296-BCDB6A8ED41B>