Subversion Best Practices

Slide 2: 4

Slide 3: Imports

Slide 4: top skimming vs cvs2svn

Slide 5: One project at a time

Slide 6: repo/project/ trunk/ branches/ tags/

Slide 7: http://cvs2svn.tigris.org/ cvs2svn.html

Slide 8: Tags and Branching

Slide 9: Don’t be afraid

Slide 10: TAGS Symbolic naming for groups of files

Slide 11: Snapshot

Slide 12: Mixed revisions

Slide 13: Don’t commit to tags

Slide 14: BRANCHES

Slide 15: Repository forks

Slide 16: Trunk Branch

Slide 17: Contain independent changes

Slide 18: Parallel commits

Slide 19: Generating releases and space to experiement

Slide 20: Trunk stays stable

Slide 21: Each release is on a branch

Slide 22: Release points are tagged

Slide 23: Branch and tag when appropriate

Slide 24: Quick example

Slide 25: Creating a release branch

Slide 26: svn mkdir -m ‘Created branches directory’ svn://repo/svn/project/branches

Slide 27: svn mkdir -m ‘Created branches directory’ svn://repo/svn/project/branches svn copy -m ‘Creating release branch 1.0’ svn://repo/svn/project/trunk svn://repo/svn/project/branches/RB-1.0

Slide 28: Checkout release branch to local working copy

Slide 29: svn co svn://svn/rep/branches/RB-1.0 rb1.0

Slide 30: Switch working copy

Slide 31: svn switch svn://svn/rep/branches/RB-1.0

Slide 32: Some time passes...

Slide 33: Generate a release

Slide 34: Tag correct files in correct branch Hopefully the latest release branch

Slide 35: svn mkdir -m ‘Created tags directory’ svn://repo/svn/project/tags svn copy -m ‘Tagging release 1.0.0’ svn://repo/svn/project/branches/RB-1.0 svn://repo/svn/project/rags/REL-1.0.0

Slide 36: Check out a tagged release

Slide 37: svn co svn://svn/rep/tags/REL-1.0.0

Slide 38: Merging

Slide 39: Trunk stays stable

Slide 40: Merge branches back to trunk

Slide 41: Trunk Merge Branch

Slide 42: svn update svn merge -r37:HEAD svn://svn/rep/branches/RB-1.0 svn commit -m ‘Merged r37 to r38’

Slide 43: svn update svn merge -r37:38 svn://svn/rep/branches/RB-1.0 svn commit -m ‘Merged r37 to r38’

Slide 44: Good for spikes

Slide 45: Good for bug fixes

Slide 46: Love your IDE

Slide 47: IntelliJ IDEA Eclipse Komodo emacs vim

Slide 48: Bonus recipe!

Slide 49: Automated integration

Slide 50: SVN hooks (just like CVS)

Slide 51: Automatic actions

Slide 52: Cruise Control

Slide 53: Harmony

Slide 54: Talk to SSG

Slide 56: slideshare.net/mza