Delete jscotto directory.

[joe-scotto]

Description

I've been modifying all keyboards within the handwired/jscotto directory in addition to moving them to handwired/scottokeebs. I have opened individual PRs for each keyboard to move into /handwired/scottokeebs so /handwired/jscotto can be removed.

• Scotto9 (Add Scotto9 handwired macropad #21105)
• Scotto36 (Add Scotto36 handwired keyboard #21104)
• Scotto40 (Add Scotto40 handwired keyboard #21103)
• ScottoCMD (Add ScottoCMD handwired keyboard #21102)
• ScottoStarter (Add ScottoStarter handwired keyboard #21101)

Types of Changes

• Core
• Bugfix
• New feature
• Enhancement/optimization
• Keyboard (addition or update)
• Keymap/layout/userspace (addition or update)
• Documentation

Issues Fixed or Closed by This PR

Checklist

• My code follows the code style of this project: C, Python
• I have read the PR Checklist document and have made the appropriate changes.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• I have tested the changes and verified that they work and don't break anything (as well as I can manage).

[fauxpark]

This shouldn't have been done in this way. Each keyboard should have been directly moved in individual PRs, rather than duplicating and then removing this old folder.

[joe-scotto]

@fauxpark I was told by @drashna that this would be the correct way to do it. I should also add that they're not really "duplicates". The way they were in the jscotto directory the keymaps weren't pristine as well as other changes that needed to be done. The new PRs I made sure to conform them as best I could to the contributing guidelines.

[fauxpark]

Sorry this wasn't better communicated. Per the PR checklist, keyboard moves and updates need to go through develop. The above PRs have basically duplicated your boards on master. This is a problem because master is merged into develop when commits are made to it, so any attempt to undo the duplication will propagate, and you'll have to start over targeting the correct branch.

[joe-scotto]

@fauxpark Shouldn't that not matter though? This PR to delete the jscotto directory is targeting develop so once the PRs for the individual boards are merged, jscotto can just be deleted on develop.

So basically once the remaining 2 boards are added to the scottokeebs directory, jscotto can completely be removed. Then that change should follow over, no?

[fauxpark]

Read what I said again. The issue isn't with the develop branch.

[joe-scotto]

@fauxpark Sorry this is confusing...

What should be done now then? Should I branch off develop for each board in jscotto and move the files there as well as updating them? So for example:

1. Branch develop -> scotto9-move
2. Move jscotto/scotto9 -> scottokeebs/scotto9
3. Update code for that board in the new location

What would have to be done about the other boards then? Since now they're basically duplicated like you say... why can't the directory just be deleted?

[fauxpark]

The key part is this:

The above PRs have basically duplicated your boards on master.

https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jscotto
https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/scottokeebs

These PRs should not have been merged to master; everything should have gone to develop. The only way forward here is to revert all of your changes so far and redo them properly:

This is a problem because master is merged into develop when commits are made to it, so any attempt to undo the duplication will propagate, and you'll have to start over targeting the correct branch.

[joe-scotto]

@fauxpark So two questions then....

1. How exactly can I go about reverting the changes if they've already been merged into master?
2. Can the new PRs, targetting develop, have changes in them to the keymaps as well?

But with that said, I guess I'm not really understanding why in this case the jscotto directory can't just be deleted after the boards are merged into scottokeebs. I read the part about aliases in the contributing document and can easily update that file but to have to start all over with 5 boards doesn't make much sense to me.

[fauxpark]

I guess I'm not really understanding why in this case the jscotto directory can't just be deleted

Because this would only affect develop. The boards are still duplicated in master.

[joe-scotto]

@fauxpark Yes, but wouldn't jscotto be deleted from master once develop gets merged? Then the boards would no longer be duplicated.

[fauxpark]

It would...in just under 3 months.

[joe-scotto]

So should I just have jscotto deleted from master? I'm really confused on what exactly needs to happen here.

[fauxpark]

Everything needs to be reverted. Then you should move + alias each board in individual PRs targeted at develop. No need for a followup PR like this one deleting the old folder, because Git doesn't consider empty folders.

[joe-scotto]

@fauxpark Aliases added along with merge conflicts being resolved. Let me know if anything else needs attention on this one.

[joe-scotto]

@fauxpark Moved to #21157.