Date: Thu, 31 Dec 2020 18:10:16 +0000 From: MR <mr@freebsd.org> To: git@freebsd.org Subject: MFC changes for stable/11 error Message-ID: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de>
next in thread | raw e-mail | index | archive | help
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 <kevans@FreeBSD.org> 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 <mr@FreeBSD.org> Date: Sat Sep 5 17:02:48 2020 +0000 ... commit 65d1fd13ac2182f7ca0c223bb723fba6d780740f Author: Michael Reifenberger <mr@FreeBSD.org> Date: Sun Jun 7 16:42:03 2020 +0000 ... commit a70af2507f720c2d7f56f51a18d358123b4770a5 Author: Kyle Evans <kevans@FreeBSD.org> Date: Mon Apr 27 16:11:59 2020 +0000 ... commit 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 Author: Kyle Evans <kevans@FreeBSD.org> 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 <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' ?!? Why? How to proceed? Thanks in advance! greetings --- Michael -- greetings --- mike mr@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1>