Polis: post-merge dev naming cleanup

Created on 24 Apr 2020  路  4Comments  路  Source: compdemocracy/polis

@patcon, I didn't want to lose this.

After pol-is-trial-balloon/polis monorepo is merged to pol-is/polis dev, there are some lingering places where renaming in necessary.

(base) CRKFrankenBook:polis crkrenn$ grep -e polis-client -e polisClient -R * -l
client-admin/package.json
client-admin/README.md
client-participation/README.md
client-participation/vis2/components/globals.js
report/src/components/globals.js
server/README.md

Most helpful comment

I adapted @patcon's script to quickly summarize changes between the current master repos and the new monorepo: https://gist.github.com/crkrenn/1223e02d171175ad2a363ea13604c659.

This should make it easier for @ballPointPenguin to do the review.

I also submitted a pull request to the monorepo branch to bring it up to the current master branches: https://github.com/pol-is-trial-balloon/polis/pull/13

All 4 comments

Oh yeah, good call! Feel free to PR to monorepo _before_ merge, if you'd like. (Making PRs onto existing PR branches isn't something I see much, but I guess should still work :) )

I adapted @patcon's script to quickly summarize changes between the current master repos and the new monorepo: https://gist.github.com/crkrenn/1223e02d171175ad2a363ea13604c659.

This should make it easier for @ballPointPenguin to do the review.

I also submitted a pull request to the monorepo branch to bring it up to the current master branches: https://github.com/pol-is-trial-balloon/polis/pull/13

I also submitted a pull request to the monorepo branch to bring it up to the current master branches:

Awesome. Note that for future catch-up from other repos, we could also add/fetch old repo remotes, then git cherry-pick commits or commit ranges directly into a branch off monorepo/dev. (Brand new files in root, like adding a package-lock.json, don't work as cleanly via cherry-pick.)

EDIT: Steps I have used:

  1. Visit https://github.com/pol-is
  2. Check if any repos updated recently
  3. Copy most recent commit hash from recently changed repo
  4. git show <sha> in local monorepo. If not found, commit is new.
  5. Copy next oldest commit and repeat.
  6. When range of new commits known:
    git checkout monorepo git checkout -b my-monorepo-sync git remote add polisFoo https://github.com/pol-is/polisFoo git fetch polisFoo git cherry-pick <sha A>..<sha B> # repeat for any repo needing updates

kk rockin, I think this is good to close :)

Was this page helpful?
0 / 5 - 0 ratings