Ensure incubator project is clean before beginning.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/ed32bb3c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/ed32bb3c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/ed32bb3c Branch: refs/heads/master Commit: ed32bb3c338095948a440d30aead7614b8a02a04 Parents: 783a54f Author: Alex Heneveld <[email protected]> Authored: Thu Jan 28 14:08:36 2016 +0000 Committer: Alex Heneveld <[email protected]> Committed: Thu Jan 28 14:08:36 2016 +0000 ---------------------------------------------------------------------- all.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/ed32bb3c/all.sh ---------------------------------------------------------------------- diff --git a/all.sh b/all.sh index 26a2194..ea73f29 100755 --- a/all.sh +++ b/all.sh @@ -5,24 +5,26 @@ set -e . env.sh -# ensure branches are all checked out +# ensure branches are all checked out, updated, and restored ( cd incubator-brooklyn && git fetch ) ( cd incubator-brooklyn && for branch in ${branches}; do [ -z "$( git branch --list ${branch} )" ] && git branch --track ${branch} origin/${branch} || true; done ) ( cd incubator-brooklyn && git checkout master && git reset --hard origin/master ) +# use the "reorg" branch for cleaned history, but first update everything from origin +( cd incubator-brooklyn && git pull && ( git branch -D reorg || true) && + ( for x in $(git branch | cut -c 3-) ; do git checkout $x ; git reset --hard origin/$x ; done ) && + git checkout master && git checkout -b reorg ) -# now restructure *in the old repo* -# use the "reorg" branch when we clean history -( cd incubator-brooklyn && git pull && ( git branch -D reorg || true) && git checkout -b reorg ) -# REARRANGE has been done, but if we needed to do it again we could again use this command, which will re-create the above reorg branch +# REARRANGE has been done, so this should now be skipped # ./1-rearrange-incubator.sh +# this is applied to all branches, local repo only; +# should NOT be pushed, it's just the basis for the splitting ./2-clean-history.sh -# should affect all branches, but should NOT be pushed -# it's just the basis for the splitting +# now create the list of files relevant to each subproject ./3-create-full-whitelists.sh - # make the new repos, in new-repos/ ./4-make-new-repos.sh +
