swarm PR git notes

notes.md

rename toplevel bzz package to swarm:

find . -type f -name '*.go' | xargs perl -i.bak -pe 's|/bzz/|/swarm/|g';
find . -type f -name '*.go.bak' | xargs rm 

creating single commit rebase from a branch with patch

http://stackoverflow.com/questions/16675766/get-the-difference-between-two-branches-in-git

Make sure the target branch is uptodate with our rebase (current develop)

git remote update
git checkout poc0.1
git merge upstream/develop

Now create a replica of this develop branch on the main repo (the PR will be against this)

git checkout develop
git merge upstream/develop
git checkout -b swarm 
git push upstream

Now create another local branch off of develop, and patch it to bring it in sync with our target branch ethersphere/poc0.1

git checkout -b swarm-poc0.1
git merge upstream/develop # just to make sure it is uptodate
git diff --binary upstream/develop poc0.1 > ~/swarm.patch
git apply ~/swarm.patch

Now add in the changes for the ONE commit PR

git add swarm/ rpc/ common/ cmd accounts/ core/

test:

godep go test -v -cpu 8 ./... > test.log
bash swarm/test/syncing/00.sh

commit with --author flag and push:

git commit --author 'ΞTHΞЯSPHΞЯΞ <viktor.tron,nagydani,zsfelfoldi}@gmail.com>' -a -m 'Swarm - plan bee for content storage and distribution on web3'
git push origin