search

hraban / tomono

Multi- To Mono-repository merge
https://tomono.0brg.net
GNU Affero General Public License v3.0
842 stars 138 forks source link

Additional support for a "step-wise" approach to consolidating repos #35

Closed timthesinner closed 2 years ago

timthesinner commented 3 years ago

Added a --just-remotes command line arg to just create remotes so engineers pulling changes do not need full sync

Added a --maintain command line arg to automatically merge history from all remotes using --strategy-option subtree="$folder/"

Added a MAIN_BRANCH envarg to support repos with a main branch that is not master

Fixed bug where re-adding a remote would fail the script

Fixed bug where a repo that has already been migrated to the target dir was not skipped when --continue was specified

hraban commented 2 years ago

Hi, thanks for your patch, this PR got closed by GH as I force pushed an unrelated tree to master.

The old diff is here: https://github.com/hraban/tomono/compare/v1...CyberGRX:master

There are some nice ideas in this PR, particularly the idea of making a smarter "continue wherever we are" mode. However I'm not a huge fan of the implementation. My biggest complaint is the large number of possible flags: I feel like if you want the script to continue, it should just do that: continue wherever you are. New repo? Import. Same remote, new url? Update. Existing remotes: pull.

Anyway, food for thought. I'm definitely taking the idea on board.

Thanks!