Internal Git

Import Project

cd ~/www
vps clone $WEBNAME
nano webname/application/config.db.ini #set username and password - only for < 3.0 Webs

# when required branch-change:
# for < 3.0:
cat $WEBNAME/application/vps_branch # shows required branch
cd ~/www/vps
git checkout $VERSION #example: git checkout 2.1

# for >= 3.0
cat $WEBNAME/vkwf_branch # shows required branch
cd ~/www/kwf
git checkout $VERSION #example: git checkout 3.0
cd ~/www/vkwf
git checkout $VERSION #example: git checkout 3.0

cd ~/www/$WEBNAME
vps import
vps create-users

Import Project in Eclipse

File -> new -> PHP Projekt(1)
Project name -> webname
Contents -> Create project at existing location (from existing source) -> take your vps cloned website (e.g. Z:\webname)
-> Next
-> Projects (2nd tab) -> Add... -> Check "Vps" *or* "Kwf"+ "Vkwf"

Checkout production branch (the first time)

# for web    
git checkout -b production origin/production

# for kwf
git checkout -b production/webname origin/production/webname

create new web

cd ~/www/template
vps create-from-template --name="Pretty Web Name" #optional: --id="webid"
cd ../webid

Update to test server

(master branch)

git add ....
git commit
git push
vps export --server=test

Import Data from production to test server

vps copy-to-test

Import Data from production to local

vps import

Small update to production server (single, small commit)

(master branch)

git add ....
git commit
git push
vps export --server=test

verify changes on test server, if ok:

git log #find commit id
git checkout production
git pull --rebase
git cherry-pick $commitid
git push
vps export --server=production

Update to production server without testing on test server (single, small commit)

git checkout production
git add ....
git commit
git push
vps export --server=production
git checkout master
git cherry-pick production #picks only the last commit, production^ for second last
git push

update to production server (multiple commits)

(master branch)

git add ....
git commit
git push
vps export --server=test

verify changes on test server, if ok:

vps go-online

apply commit to other repository

git format-patch HEAD~1 #creates patch file for last 1 commit
mv 0001-* ../otherrepo #move patch file to where you want to apply patch
cd ../otherrepo
git am --3way 0001-*

# if patch causes conflict apply manually and fix conflict
git apply --verbose --reject $PATCHNAME

# cleanup
rm 0001-*

# push changes
git push

initial setup of web online

set server.domain and server.path in config.ini to correct values (production + test section)

vps setup-online --server=test,production

freeze/tag web the first time (create production branch)

vps go-online

solr configuration

Config Solr for POI

Compile Kdevelop

# 1. Source the cmakekde command 
source ~/kdev

# 2. Update and compile kdevplatform in ~/kdesvn
git pull --rebase
cmakekde

# 3. Update and compile the other directories (kdevelop, kdev-php, kdev-php-docs) in ~/kdesvn
git pull --rebase
cmakekde

Rename Web

Rename Web (at Koala-Framework)