update all.sh to skip the reorg step, since reorg is now in incubator-brooklyn
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/1f8eee29 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/1f8eee29 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/1f8eee29 Branch: refs/heads/master Commit: 1f8eee29eada387763f46b5bf34045e66b0b70a5 Parents: 675f13e Author: Alex Heneveld <[email protected]> Authored: Wed Jan 27 13:00:12 2016 +0000 Committer: Alex Heneveld <[email protected]> Committed: Wed Jan 27 13:00:12 2016 +0000 ---------------------------------------------------------------------- all.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/1f8eee29/all.sh ---------------------------------------------------------------------- diff --git a/all.sh b/all.sh index 3198dd4..99f87ff 100755 --- a/all.sh +++ b/all.sh @@ -12,8 +12,10 @@ set -e # now restructure *in the old repo* -./1-rearrange-incubator.sh -# committed to 'reorg' branch which could be pushed +# use the "reorg" branch when we clean history +( cd incubator-brooklyn && git pull && git branch -D reorg && 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 ./2-clean-history.sh # should affect all branches, but should NOT be pushed
