SVN Merge

gistfile1.txt

// (1) Branch my-calc-branch erzeugen

  svn copy 
	http: //svn.example.com/repos/calc/trunk \
	http: //svn.example.com/repos/calc/branches/my-calc-branch \
      	-m "Creating a private branch of /calc/trunk."



// (2) Branch my-calc-branch checkout

  svn checkout 
	http://svn.example.com/repos/calc/branches/my-calc-branch



// (3) Hack Hack, commit, Hack Hack, commit ...



// (4) Merge trunk --> branch
// Der trunk wird in den branch integriert
// Aktuelles Repository: 
// http://svn.example.com/repos/calc/branches/my-calc-branch

  svn merge 
	http://svn.example.com/repos/calc/trunk



// (5) Schritt 3 + 4 wiederholen bis Feature fertig



// (6) Merge branch --> trunk
// Der branch wird in den trunk reintegriert
// Achtung - jetzt muss man den trunk ausgecheckt haben

  svn merge 
	--reintegrate 
	http://svn.example.com/repos/calc/branches/my-calc-branch



// (7) Branch löschen

  svn delete 
	http://svn.example.com/repos/calc/branches/my-calc-branch \ 
	-m "Remove my-calc-branch."