Hi Laszlo, Am Freitag, den 22.11.2019, 08:18 -0800 schrieb Laszlo Kishalmi: > > Usually who and how does the integration PR-s from code donations? > > I would like to see at least the dark LaF support landing early. I could > donate some of my free time on that, I just would like to know how shall > it happen. >
I would do it like this: - create an orphaned branch inside the netbeans git repository git checkout --orphan import-dark-laf - remove all files and directories from the repository ( git rm -rf . for i in *; do rm -r $i; done -> You now have an empty branch - Extract the files you need from the donation archive. Try to keep the structure identical to the archive, but move the files as near as possible to the location they shall have after merging (it might help to have a second netbeans clone from master nearby to be able to recreate the directory structure) - Commit this with a reference to the source of the file, a link to the mailinglist archive with the oracle donation document and the information, that you downloaded the zip, checked the SHA256 and extracted the files - Do all the cleanup you can do without having the complete netbeans source code present (headers, licenseinfo.xml, ...) - Commit the cleanup work (can be multiple commits) - Merge master into this, now you have a working tree: git merge --allow-unrelated-histories master - Update the code (cluster references, further cleanup work) so that a working netbeans is build, that contains the dark LAF => create a PR from this The core part is, that the source of the original files needs to be traceable to the code donation and an empty branch makes it easy to verify, that all files you imported come from the donation zip. Please note: I tested this only very lightly, so be prepared that it could fail at some point. HTH Matthias --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
