From 01d9c7c4bde5e34a3558cacfacfac36cb1c6d348 Mon Sep 17 00:00:00 2001 From: Polymetric Date: Thu, 24 May 2018 15:42:00 -0400 Subject: [PATCH 1/2] Create README in hardware folder The contents of the `hardware/` folder were moved, but it wasn't obvious straight away from looking at the repository. This makes it immediately obvious for anyone looking for something in this folder. --- hardware/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 hardware/README.md diff --git a/hardware/README.md b/hardware/README.md new file mode 100644 index 00000000000..3043da2f768 --- /dev/null +++ b/hardware/README.md @@ -0,0 +1,9 @@ +### Cores have been moved +Originally, the main Arduino repository contained Arduino +platforms/cores in this directory. Since then, these have been moved to +their own repositories instead (see commit 2e98854 and d6b40d0). + +The official Arduino cores can now be found here: + - https://github.com/arduino/ArduinoCore-avr + - https://github.com/arduino/ArduinoCore-sam + - https://github.com/arduino/ArduinoCore-samd From a4381cd0f3568eda076e53805ee4ea759e0f72aa Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Tue, 29 May 2018 15:53:36 +0200 Subject: [PATCH 2/2] Add instructions for migrating commits to ArduinoCore-avr --- hardware/README.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/hardware/README.md b/hardware/README.md index 3043da2f768..e7d448b6c8c 100644 --- a/hardware/README.md +++ b/hardware/README.md @@ -7,3 +7,40 @@ The official Arduino cores can now be found here: - https://github.com/arduino/ArduinoCore-avr - https://github.com/arduino/ArduinoCore-sam - https://github.com/arduino/ArduinoCore-samd + +##### Migrating commits +If you need to move commits and/or pull requests over from this +repository into the separate core repositories, an approach to handle +that mostly automatically is suggested below. These are for the avr +core, but with some changes, it should apply to sam as well. + + # Start out in the Arduino repo, by rebasing your branch on top of the + # last commit that still contained the avr core. This makes sure that + # any conflicts are resolved before transferring the commits, since git + # am is not so helpful with conflicts. + git checkout my-branch + git rebase -i 950d88dcbe7b9b2d348fb25b5ffcd0c6d2d30b97 + + # Then, generate patch files for all of your commits, into the patches + # directory. + git format-patch -o patches 950d88dcbe7b9b2d348fb25b5ffcd0c6d2d30b97 + + # These steps are optional, but if your commits contain changes to other + # files than the avr core, this re-applies your commits with only the + # avr core changes, and regenerates the patches + git checkout -b tmp-branch 950d88dcbe7b9b2d348fb25b5ffcd0c6d2d30b97 + git am --include 'hardware/arduino/avr/*' patches/* + rm -rf patches/ + git format-patch -o patches 950d88dcbe7b9b2d348fb25b5ffcd0c6d2d30b97 + + # Then, in the ArduinoCore-avr repo, create a new branch on the commit + # matching the Arduino repo. + git checkout -b my-branch b7c607663fecc232e598f2c0acf419ceb0b7078c + + # Apply our previously generated patches (update the path to point to + # wherever you generated the patches previously). -p4 tells git am to + # strip the a/hardware/arduino/avr part of the paths before applying. + git am -p4 /path/to/patches/* + + # Finally, rebase on top of master + git rebase origin/master