Page MenuHomeFreeBSD
Paste P470

MFCs gone wild
ActivePublic

Authored by gjb on Thu, Dec 31, 4:33 PM.
Command line history of the MFC of c3e89a30fdc2c985b73f46ab2f414d53945fc00b (main) to stable/12 and stable/11:
# Note, some of the $PWD from history(1) is confusing, since I tend to use 'cd -' quite often. I did my best to untangle what happened here.
main:
1333 10:22 vim COPYRIGHT sys/sys/copyright.h
1334 10:22 git diff
1337 10:23 git commit COPYRIGHT sys/sys/copyright.h
1338 10:29 git push -n
1340 10:29 git pull
1341 10:29 git rebase
1342 10:29 git log
1343 10:29 git push
stable/12:
1346 10:32 git cherry-pick -x c3e89a30fdc2c985b73f46ab2f414d53945fc00b --edit
1347 10:32 git push -n
# Oops. Stale tree.
1348 10:32 git pull
1349 10:32 git rebase
1376 10:37 vi COPYRIGHT sys/sys/copyright.h
1377 10:38 git diff
1378 10:38 git push
1390 10:39 git cherry-pick --continue
1393 10:39 git status
1394 10:40 git commit COPYRIGHT sys/sys/copyright.h
1402 10:40 git push
stable/11:
1352 10:33 git pull
1353 10:33 git cherry-pick -x c3e89a30fdc2c985b73f46ab2f414d53945fc00b --edit
--------------
Auto-merging sys/sys/copyright.h
CONFLICT (content): Merge conflict in sys/sys/copyright.h
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 18247 and retry the command.
error: could not apply c3e89a30fdc... copyrights: Happy New Year 2021
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'
--------------
% git status
On branch stable/11
Your branch is up to date with 'origin/stable/11'.
You are currently cherry-picking commit c3e89a30fdc.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: COPYRIGHT
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: sys/sys/copyright.h
% git cherry-pick --continue
U sys/sys/copyright.h
error: Committing is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
# In both cases, reverting the $FreeBSD$ ID was missing, although I edited them locally. Should I have done a 'git commit' on my stable/* branches first?

Event Timeline

gjb created this object in space S1 Global.
gjb created this object with edit policy "gjb (Glen Barber)".