git should be able to handle cherry-picks automatically regardless of
the move to the "engine" subdirectory in the Collabora repo. I just
tried with a "random" commit from their main branch and that worked as
expected.
Sample steps:
1) add the Collabora repo as a remote to the existing LO core one:
git remote add collabora
ssh://<YOUR_USER_NAME>@gerrit.collaboraoffice.com:29418/online
(or use an https URL that doesn't require authentication)
2) `git remote update`
3) find the commit you're interested in: `git log collabora/main`
4) cherry-pick to the local branch:
git cherry-pick -x 64dd38c12dbea925478b9cb7349b6845104dc92e
Of course, if the files within the repo diverge, any merge conflicts
will still have to be handled manually.
Hi Michael,
I gave a try for https://gerrit.collaboraoffice.com/c/online/+/2206
1) ok but used https://gerrit.collaboraoffice.com/online since I don't
have an account on Collabora
2, 3 and 4) ok (found commit id : 1c2ff94b6079451a7047a2afb45467d6fe31cb4f)
Notice I had to do these:
git add emfio/qa/cppunit/emf/data/TestExtSelectClipRgnCopy.emf
git cherry-pick --continue
git pull rebase
=> https://gerrit.libreoffice.org/c/core/+/205072
Thank you for your feedback!
Julien
