- From: Majid Valipour via GitHub <sysbot+gh@w3.org>
- Date: Wed, 08 Aug 2018 20:27:39 +0000
- To: public-houdini-archive@w3.org
My aim to migrate the repository without losing any of the history. Git properly handler merging two unrelated repositories in a single commit which ensure the final commit carries both histories. Most merge commits have a diamond shape where one side is branch from the main branch at some earlier point but it is possible to merge to branches that don't share an ancestor. This is what I am proposing to do here. Here is the series of commands I will be using: ``` $ cd css-houdini-drafts $ git remote add wicg git@github.com:WICG/animation-worklet.git $ git fetch wicg $ git checkout -b wicg wicg/gh-pages $ mkdir css-animationworklet $ mv * css-animationworklet/ $ git add . $ git commit -m "Move to sub-directory in preparation to repo migration" $ git checkout master $ git merge --allow-unrelated-histories wicg ``` Here is a the [result](https://github.com/majido/css-houdini-drafts/commit/5c7d43a1997a93aa6db8dd5af2d6cb9d7c0c1a61) I can them make PR and that can be merged to the main repo without squashing or rebasing. # Post merge I think it is best to move the repository with minimum require change (i.e., only move to sub-directory). Once repository is merged in css-houdini-drafts I will followup with these cleanups: - Remove redundant w3c.json, CONTRIBUTING, LICENSE - Use correct name and URL in the spec and README - rename index.bs to Overview.bs -- GitHub Notification of comment by majido Please view or discuss this issue at https://github.com/w3c/css-houdini-drafts/issues/788#issuecomment-411541075 using your GitHub account
Received on Wednesday, 8 August 2018 20:27:47 UTC