Skip to content

Instantly share code, notes, and snippets.

@lwrage
Last active May 4, 2018 21:19
Show Gist options
  • Save lwrage/d90d224e0bbfbe900107f3e031356038 to your computer and use it in GitHub Desktop.
Save lwrage/d90d224e0bbfbe900107f3e031356038 to your computer and use it in GitHub Desktop.
Checklist for OSATE repository merge

create lwrage/repo1, 2, 3 on github

create readme files

add issue to all repos, reference commmit in repo3

set up waffle for repos

create branch in repo1 for repo3/issue1

create branch in repo2 for repo3/issue2

make pull requests for both

merge repos into monorepo

make sure there's a clone of repo3 around

cd monorepo

git remote add origin git@github.com:lwrage/repo3

git push --dry-run --force --all

and now for real

`git push --tags'

rename repo3 to monorepo on github

open waffle -> all renamed to monorepo

original branches are still in monorepo, need to be deleted!

need to merge master into migrated branches

create lwrage/repo3, push --all push --tags from original local clone

  • test renaming repo with issues and a pull request on github

  • test force push to repository with issues and pull request referencing issue using old repo name

  • test new repo with old name creation

  • send migration announcement

  • make all existing repositories read-only

  • pull from all osate repos

  • run merge script locally: in ~/projects/monorepo/rewrite run python3 repomerge.py monorepo repolist.txt

  • add osate/osate2-core as remote to monorepo

  • force push

  • rename osate/osate2-core to osate/osate2

  • OPEN WAFFLE NOW to update the waffle board

  • create osate/osate2-core on github

  • push osate2-core

  • check that everyone on the team can access the osate2 repo

  • update tycho build

  • update description of developer setup on osate.org

  • update jenkins build configuration for osate

  • check if other build configurations need to be updated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment