# ------------------------------------------------------------------------

# This work is licensed under the Creative Commons
# Attribution-Noncommercial-Share Alike 3.0 Unported License.
# To view a copy of this license, visit
# http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a
# letter to Creative Commons, 171 Second Street, Suite 300, San Francisco,
# California, 94105, USA.

# Permissions beyond the scope of this license may be available by
# contacting the copyright owner.

# Copyright Ben Balbo <ben@benbalbo.com>

# ------------------------------------------------------------------------

# Related files are available at http://benbalbo.com/talks/

# This demo assumes you've followed all steps in demo 1.

# ------------------------------------------------------------------------

# dev 1 wants to make quite a few changes so branches
svn copy http://svn.localhost/test/trunk http://svn.localhost/test/branches/change1

# still in trunk 
svn info

# let's switch to branch "change1" - ensure you're in the root checkout directory
cd ..
svn switch http://svn.localhost/test/branches/change1

# compare svn info between dev1 and dev2

# create new content
cd www
cp ~/tmp/index.php .
mkdir images
cp ~/tmp/placeholder.jpg images/

# check in - go home
svn add images
svn ci -m 'content added'

# continue to rowk
mkdir css
cp ~/tmp/style.css css/

# check in
svn add css
svn ci -m 'final changes for this branch'

# QA tests the current changes and requests a merge with trunk

# dev 1 switches back to trunk
cd ..
svn sw http://svn.localhost/test/trunk

# all changes gone!

# now he merges the changes from the branch to the local working copy of trunk
svn merge http://svn.localhost/test/branches/change1 .

# dev 2 still can't see this though, it's not checked in yet

# dev 1 checks in
svn ci -m 'merged change1 into trunk'

# dev 2 updates
svn up

# the release manager decides to tag the current version of trunk as version 1.0
# she operates with fully qualified URLs so she doesn't have to check anything out
svn copy http://svn.localhost/test/trunk http://svn.localhost/test/tags/0_1