Merge the native and client repos

[jgaehring]

• Create a git subtree merge commit to pull farmOS-client into a client subdirectory.
• Move stuff from client subdirectory to new homes in this repo.
• Transfer all issues (open and closed) from farmOS-client
• Move farmOS-client repo to farmOS-legacy
• Rename this repo (from farmOS-native to farmOS-client) (see [META] Naming the native app in app stores #86)
• Update documentation page: https://farmos.org/development/client/
• Update repo README

[mstenta]

(Started a checklist in the issue description with some of the housekeeping things we don't want to forget.)

[jgaehring]

This looks like a pretty good procedure to follow: https://gist.github.com/msrose/2feacb303035d11d2d05

[mstenta]

For reference, I did something similar (with notable differences) earlier in the history of farmOS: https://www.drupal.org/project/farm/issues/2876992

[mstenta]

Discussed with @jgaehring in chat, but posting here for posterity:

one way we could approach the merge... since it seems like a lot of little things will need to be figured out...

(paraphrased:)

Use a git subtree merge (https://stackoverflow.com/questions/1425892/how-do-you-merge-two-git-repositories) to simply pull farmOS-client into farmOS-native as a subdirectory.

This would basically create a new "client" directory in farmOS-native, which contains all the files from farmOS-client, along with their Git history.

Then...

make follow up commits that move/change stuff as necessary to make them work together
eg: modify root package.json and delete client package.json
eg: move client src into native src
so that basically you are just clearing out the temporary merged directory by moving things into new places
that might be the easiest way to approach it a step at a time, without getting overwhelmed... while also maintaining the git history

[mstenta]

Git Subtree merge is easy...

In farmOS-native, just run this command:

git subtree add --prefix=client git@github.com:farmOS/farmOS-client.git master

That will create a "client" subdirectory with farmOS-client inside it.

[jgaehring]

Well, they're merged!

@alexadamsmith, if you pull down the master branch now, you should have everything you need to keep up with development right in this (the native) repo. There are still some things I'll be moving around, but for the most part it should be stable enough for you to commit on top of the master branch now. Let me know if you run into any trouble. Perhaps at some point we could have a talk about where to go from here in terms of architecture.

Now it's just a matter of checking things off that list above. I'll get a start on documentation tomorrow. @mstenta , I think you're the only one who can move issues, or move the move the client repo to farmos-legacy. Then there's the name.... hmm, I'm still not quite ready to pull the trigger, but perhaps after some more discussion.

[alexadamsmith]

Got it - and it's working great! Thanks so much, Jamie!

[mstenta]

Looks great!!!

I especially like this commit: abd73af ;-)

[mstenta]

I will work on moving the issues from farmOS-client in a little bit, and also move it to the farmOS-legacy group.

I already updated the description to note that it's deprecated and linked to this issue.

[mstenta]

FYI: this issue had some good ideas/discussion in it #30

[mstenta]

As you can see I transferred all issues from the old farmOS-client repo to this one (sorry for the spam!).

[mstenta]

Moved old repo to https://github.com/farmOS-legacy/farmOS-client

[mstenta]

Moved this repo to farmOS-client and merged farmOS/farmOS.org#44 - thanks @jgaehring !

[jgaehring]

Finished updating the README, so closing...