You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 19:01:42 UTC
[44/50] [abbrv] brooklyn-client git commit: environment fixes
following feedback from @aledsage
environment fixes following feedback from @aledsage
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/47d26ffa
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/47d26ffa
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/47d26ffa
Branch: refs/heads/master
Commit: 47d26ffaa834248c9a18d75a3cc575256dbbb07f
Parents: 6a67027
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jan 28 12:29:18 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jan 28 12:29:18 2016 +0000
----------------------------------------------------------------------
README.md | 21 +++++++++++++--------
all.sh | 2 +-
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/47d26ffa/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 840cf21..5bf962a 100644
--- a/README.md
+++ b/README.md
@@ -6,23 +6,24 @@ mailing list.
To try it out:
```{shell}
-git clone https://github.com/rdowner/brooklyn-repo-split.git
+git clone https://github.com/ahgittin/brooklyn-repo-split.git
cd brooklyn-repo-split
git submodule init
git submodule update
./all.sh
```
-Then look for the results:
-* in `incubator-brooklyn`, a `reorg` branch which restructures incubator along lines of the new projects
-* in `new-repos`, all the new repos we want to create appropriately carved up including carved up history
+Then look for the results, all the new repos in `new-repos`,
+carved up including carved up history
Running this script can take a couple of hours. You can run parts of it; see below.
## Files
-The script runs several stages, as indicated by the commands `1-*.txt`, `2-*.txt`, ... .
+The file `env.sh` sets local environment variables. Adjust to suit your individual identity.
+
+The script runs several stages, as indicated by the commands `1-*.sh`, `2-*.sh`, ... .
For the most part these can be run individually.
There are a few other scripts `*.sh` and programs `*.rb` used by the scripts above.
@@ -41,11 +42,15 @@ The files `big-to-small.*` are a script and output of a program which records th
## Steps
-Steps 1 and 2 are done and checked in as `reorg*` branches at https://github.com/ahgittin/incubator-brooklyn .
+Step 1 is done and applied to `incubator-brooklyn`, and now skipped as part of `all.sh`.
+
+Step 2 is required locally at least once.
Step 3 has been run and the results checked in here (`*-whitelist.full.gen.txt`).
-*All steps will need re-run as more changes are pushed to incubator (or any corresponding changes applied to those branches).*
+Step 4
+
+*Steps 2-4 will need re-run as more changes are pushed to incubator.*
The steps are now pretty quick, with 1 taking <1m, 2 taking 20m, 3 taking 3m, on my box.
Step 4 takes the longest, about 15m per sub-repo or 1h30m total.
@@ -53,5 +58,5 @@ Step 4 takes the longest, about 15m per sub-repo or 1h30m total.
## References
-http://naleid.com/blog/2012/01/17/finding-and-purging-big-files-from-git-history
+* http://naleid.com/blog/2012/01/17/finding-and-purging-big-files-from-git-history
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/47d26ffa/all.sh
----------------------------------------------------------------------
diff --git a/all.sh b/all.sh
index 99f87ff..26a2194 100755
--- a/all.sh
+++ b/all.sh
@@ -13,7 +13,7 @@ set -e
# now restructure *in the old repo*
# use the "reorg" branch when we clean history
-( cd incubator-brooklyn && git pull && git branch -D reorg && git checkout -b reorg )
+( 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
# ./1-rearrange-incubator.sh