From owner-freebsd-git@freebsd.org Thu Dec 31 18:35:27 2020 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 2EB1E4CAB73 for ; Thu, 31 Dec 2020 18:35:27 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4D6Gzy1qfSz3QLY for ; Thu, 31 Dec 2020 18:35:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id C238F4CAE47; Thu, 31 Dec 2020 18:35:23 +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 BC85A4CAE45 for ; Thu, 31 Dec 2020 18:35:23 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) (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 4D6Gzt6GYCz3QFM; Thu, 31 Dec 2020 18:35:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f51.google.com with SMTP id r9so17754870ioo.7; Thu, 31 Dec 2020 10:35:22 -0800 (PST) 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=6Kb3xZExQMbueCQUBniUEtp64GBodcS9qAdAagERF/g=; b=L1tbVmXpZInYP/4KRKTDVdxn2lAAXxa2EbRGtC46LakWoGMwYAhxtBwgUPgOP2yNr/ HD3A4WapT1ptY9H1b/hA2b5lIpfhoBRNy+ZIzmo32VAG80nEml4pUs4vVyq4Hjjq7gXa cJ1OpxdzHIeR7jfmSqeswD0yrUVhAofvwhgjv83HWjdxNZuvswXrj7DfPvSX3M30f8+6 d+VO1KC9RcBei55Tnm/kuA0vKVw2vQdIv2Mjqrfgnt/pHGnyM4yiBD0GvVWN0FwEYW1O DigtM5Ci+XBvojfbkGnRmt++kE9OTrNdO+Igjp1ZVubuSdnSVMAjDJ1R3qWbIgH61gWT ZVmg== X-Gm-Message-State: AOAM531e7wSyET4TuTGHudsGHQw7hOBLYCzFdLYzEpjS8HO3J8Jqqfv/ BjV8KH8wP3gVq3npk+qoakMuRpLX6JWmtn9JMg/jfjOtpB7SUQ== X-Google-Smtp-Source: ABdhPJw0IrcNUiMk+wWYHv7EDs0CjpWznJSGq8Dk4WbGI10+jIs2/aFFYp8vGY6Xn6S2EhwG7FObGNyc68643um7/V8= X-Received: by 2002:a5e:c012:: with SMTP id u18mr47683659iol.15.1609439719312; Thu, 31 Dec 2020 10:35:19 -0800 (PST) MIME-Version: 1.0 References: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> In-Reply-To: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> From: Ed Maste Date: Thu, 31 Dec 2020 13:35:06 -0500 Message-ID: Subject: Re: MFC changes for stable/11 error To: MR Cc: git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D6Gzt6GYCz3QFM X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Thu, 31 Dec 2020 18:35:27 -0000 On Thu, 31 Dec 2020 at 13:10, MR wrote: > > error: could not apply a70af2507f72... 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' This is presumably just because there are additional changes that were merged to stable/12 and not stable/11. kevans' "MFC -fno-common fixes" commit is: stable/11 e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb stable/12 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 as you mentioned this is the most recent usr.bin/systat commit in stable/11, while there are three additional changes in stable/12 in usr.bin/systat after that one. But if we compare usr.bin/systat at those two hashes we see: $ git diff --stat e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 usr.bin/systat usr.bin/systat/Makefile | 2 +- usr.bin/systat/Makefile.depend | 1 - usr.bin/systat/cmds.c | 4 +++- ... 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. $ git cherry-pick -x a70af2507f720c2d7f56f51a18d358123b4770a5 ... error: could not apply a70af2507f72... 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. It seems two files conflicted: usr.bin/systat/vmstat.c usr.bin/systat/zarc.c the conflict in the former can be resolved automatically; for zarc.c you can check what's merged to stable/12: % git log ..freebsd/stable/12 usr.bin/systat/zarc.c Looking through the commits it seems at least 45e9405ea4b05926b22a743237cbfe918206db50 was not merged and is responsible for at least one of the conflicts.