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:13 UTC

[15/50] [abbrv] brooklyn-client git commit: update readme and tweak so that stale server items aren't brought in

update readme and tweak so that stale server items aren't brought in


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/635d648c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/635d648c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/635d648c

Branch: refs/heads/master
Commit: 635d648cc9e99ff5f9d1b3f1563afc7c051f90f2
Parents: 4e533c8
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 16 17:41:28 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 16 17:41:28 2015 +0000

----------------------------------------------------------------------
 3-create-full-whitelists.sh |  2 +-
 README.md                   | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/635d648c/3-create-full-whitelists.sh
----------------------------------------------------------------------
diff --git a/3-create-full-whitelists.sh b/3-create-full-whitelists.sh
index 337e242..c2f4698 100755
--- a/3-create-full-whitelists.sh
+++ b/3-create-full-whitelists.sh
@@ -19,6 +19,7 @@ git log --pretty=format: --name-only --diff-filter=A | sort -u > ../all-files-ev
 
 popd
 
+cp server-whitelist.full.gen.txt server-only-whitelist.full.gen.txt
 cat *-whitelist.full.gen.txt | sort -u > all-files-claimed.gen.txt
 
 # keep only lines in all-files-ever which aren't in all-files-claimed
@@ -27,6 +28,5 @@ comm -13 all-files-claimed.gen.txt all-files-ever.gen.txt > unclaimed-files.gen.
 
 # put unclaimed files in the server whitelist so we don't lose them
 # keep the server-only files in case useful
-cp server-whitelist.full.gen.txt server-only-whitelist.full.gen.txt
 cat server-only-whitelist.full.gen.txt unclaimed-files.gen.txt | sort -u > server-whitelist.full.gen.txt
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/635d648c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6699bc1..840cf21 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ 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
 
-Running this script can take a few hours.
+Running this script can take a couple of hours.  You can run parts of it; see below.
 
 
 ## Files
@@ -41,12 +41,16 @@ 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 branches at https://github.com/ahgittin/incubator-brooklyn .
+Steps 1 and 2 are done and checked in as `reorg*` branches at https://github.com/ahgittin/incubator-brooklyn .
 
-Step 3 has been run and the results checked in here (`*-whitelist.full.txt`)
+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).*
 
+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.
+
+
 ## References
 
 http://naleid.com/blog/2012/01/17/finding-and-purging-big-files-from-git-history