Move icommands back into main repo

[SwooshyCueb]

When the decision was made to split the icommands into their own repository, it made sense. However, the reasons for doing so are no longer relevant, and the split repository is an obstacle for Normal and Boring packaging. Let's move the icommands back into the main repo.

[SwooshyCueb]

A reddit thread on merging one git repository into a subdirectory of another while preserving commit history: https://www.reddit.com/r/git/comments/sheoo3/merge_git_repo_with_another_repos_subdirectory/

[trel]

Original removal of the iCommands was in 831809e for #2239 in the run-up to 4.2.0 and the use of CMake.

--

A quick read suggests we're looking at a merge commit (the horror!) with the following...

https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---allow-unrelated-histories

Another couple posts suggests the same process...

• https://jdriven.com/blog/2021/04/how-to-merge-multiple-git-repositories
• https://gfscott.com/blog/merge-git-repos-and-keep-commit-history/

[trel]

where do you propose to attach into the tree?

in a directory called clients? irods/irods/clients/icommands

just a single client? irods/irods/client/icommands

somewhere else?

[SwooshyCueb]

clients/icommands makes the most sense to me