search

rust-crates / ergo

the ergo crate ecosystem: making rust's ecosystem more ergonomic, therefore more fun.
Other
58 stars 3 forks source link

Consolodate #11

Closed vitiral closed 5 years ago

vitiral commented 5 years ago

This consolodates the various git reposotories into a single workspace. I don't think there are any disadvantages to this.

I will delete the other repositories after this is merged.

@killercup let me know if you have any objections.

I have to say, I'm a HUGE fan of workspaces!

vitiral commented 5 years ago

I followed this guide for consolodating:

https://stackoverflow.com/a/20974621/1036670

I also edited that answer with a helpful script

PROJ=<your-repo-name>
echo PROJ="merging $PROJ with master" && \
  git remote add -f $PROJ git@github.com:<your-user-name>/${PROJ}.git && \
  git checkout -b ${PROJ}_branch $PROJ/master && \
  mkdir $PROJ && git mv $(ls -I $PROJ) $PROJ && \
  rm -f .gitignore .travis* && \
  git commit -am "move files to subdir" && \
  git checkout master && \
  git merge ${PROJ}_branch --allow-unrelated-histories
killercup commented 5 years ago

Cargo workspaces are great!

That SO answer confuses me. I've used git subtree add -P <crate-name> <repo-url> <branch> – which is far easier :) – and all the history stayed intact AFAIK.

vitiral commented 5 years ago

Lol, that would have been good to know! So you approve of this change?