Subversion Retake manat lertpeetipat (sid)

Why We Need Source Control?

The Big Undo you will always be able to go back .... from your mess

You Are Not Alone so we need a centralized system

We Are Professionals there are only thin lines between pro and unpro

Revisit the Fundamental

Repository a central store of data

Working Copy a local store of data

Trunk, Branches and Tags repository/project/ trunk/ branches/ tags/

Creating a Branch $ svn copy http://galaxium.googlecode.com/svn/trunk http://galaxium.googlecode.com/svn/trunk/experiment-1.0 -m "Creating experiment branch of Galaxium project. make a copy of the project

Merge from Branch to Trunk $ cd $WORKING_COPY_OF_MAIN_TRUNK $ svn update $ svn log --stop-on-copy commit changes from branch to trunk $ svn merge --dry-run -r 150:HEAD http://galaxium.googlecode.com/svn/trunk/experiment-1.0 $ svn commit -m “Merge works from branches/experiment-1.0 to trunk”

Updating from Trunk to Branch update latest code from trunk to your branch $ cd $WORKING_COPY_OF_BRANCH $ svn update $ svn log --stop-on-copy $ svn merge --dry-run -r 150:HEAD http://galaxium.googlecode.com/svn/trunk $ svn commit -m “Updated code from trunk rev.150”

1 st br anch 2 nd branch trunk merge time update

Workflow

update make changes examine changes merge other's changes commit

Merge Other's Changes show modification using diff

Don't Be Afraid conflicts might happened

it is not that difficult Don't Panic

Examine Changes trunk is a holy place. test it before

Commit it is about traceable so provide useful messages

Troubleshooting

Working Copy is Out of Date most problems fixed with svn update

Working Copy is Locked or Corrupted do not manipulate files store in repository manually if it's too late run: svn cleanup working-copy

Already Under Version Control again, when it comes to svn, use svn command

Question ?