From owner-freebsd-git@freebsd.org Thu Dec 31 18:10:25 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 9292A4CA011 for ; Thu, 31 Dec 2020 18:10:25 +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 4D6GR53hL2z3NMC for ; Thu, 31 Dec 2020 18:10:25 +0000 (UTC) (envelope-from mr@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7E17E4CA010; Thu, 31 Dec 2020 18:10:25 +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 7DD614C9F9E for ; Thu, 31 Dec 2020 18:10:25 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from app.eeeit.de (app.eeeit.de [188.68.43.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6GR45P5Tz3N1F for ; Thu, 31 Dec 2020 18:10:24 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from localhost (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mike@reifenberger.com) by app.eeeit.de (Postfix) with ESMTPSA id 9C96C3B0AB for ; Thu, 31 Dec 2020 19:10:16 +0100 (CET) Received: from ipbcc0fd0a.dynamic.kabel-deutschland.de (ipbcc0fd0a.dynamic.kabel-deutschland.de [188.192.253.10]) by app.eeeit.de (Horde Framework) with HTTPS; Thu, 31 Dec 2020 18:10:16 +0000 Date: Thu, 31 Dec 2020 18:10:16 +0000 Message-ID: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> From: MR To: git@freebsd.org Subject: MFC changes for stable/11 error User-Agent: Horde Application Framework 5 Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes MIME-Version: 1.0 Content-Disposition: inline X-Rspamd-Queue-Id: 4D6GR45P5Tz3N1F X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:197540, ipnet:188.68.32.0/20, country:DE]; local_wl_from(0.00)[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: Thu, 31 Dec 2020 18:10:25 -0000 Hi, as it seems, for me, git is not as intuitive as svn. I want to MFC the latest changes from stable/12 to stable/11 for usr.bin/systat. I do: # git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/src.git freebsd-11 # cd freebsd-11 # git checkout stable/11 Now looking for the last commit: # git log usr.bin/systat/ ... commit e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb Author: Kyle Evans Date: Thu Apr 9 20:38:36 2020 +0000 ... # git checkout stable/12 What is newer in stable/12: # git log usr.bin/systat/ ... commit 7a446028cedb13a0d2004cf6f584291a976392da Author: Michael Reifenberger Date: Sat Sep 5 17:02:48 2020 +0000 ... commit 65d1fd13ac2182f7ca0c223bb723fba6d780740f Author: Michael Reifenberger Date: Sun Jun 7 16:42:03 2020 +0000 ... commit a70af2507f720c2d7f56f51a18d358123b4770a5 Author: Kyle Evans Date: Mon Apr 27 16:11:59 2020 +0000 ... commit 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 Author: Kyle Evans Date: Thu Apr 9 20:35:35 2020 +0000 ... OK. So it should miss: 1.) a70af2507f720c2d7f56f51a18d358123b4770a5 2.) 65d1fd13ac2182f7ca0c223bb723fba6d780740f 3.) 7a446028cedb13a0d2004cf6f584291a976392da Right? Now we try as suggested in: https://github.com/bsdimp/freebsd-git-docs/blob/main/MFC.md # git checkout -b tmp-branch stable/11 Switched to a new branch 'tmp-branch' # git cherry-pick -x a70af2507f720c2d7f56f51a18d358123b4770a5 Auto-merging usr.bin/systat/zarc.c CONFLICT (content): Merge conflict in usr.bin/systat/zarc.c Auto-merging usr.bin/systat/vmstat.c CONFLICT (content): Merge conflict in usr.bin/systat/vmstat.c Auto-merging usr.bin/systat/systat.h Auto-merging usr.bin/systat/swap.c Auto-merging usr.bin/systat/iostat.c Auto-merging usr.bin/systat/devs.c warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 11054 and retry the command. 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' ?!? Why? How to proceed? Thanks in advance! greetings --- Michael -- greetings --- mike mr@freebsd.org