Some useful best practices for subversion revision control

2. 4

3. Imports

4. top skimming
vs
cvs2svn

5. One project at a time

6. repo/project/
trunk/
branches/
tags/

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

8. Tags and Branching

9. Don’t be afraid

10. TAGS
Symbolic naming
for groups of files

11. Snapshot

12. Mixed revisions

13. Don’t commit to tags

14. BRANCHES

15. Repository forks

16. Trunk
Branch

17. Contain independent
changes

18. Parallel commits

19. Generating releases
and
space to experiement

20. Trunk stays stable

21. Each release is on a branch

22. Release points are tagged

23. Branch and tag
when appropriate

24. Quick example

25. Creating a release branch

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

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

28. Checkout release branch to
local working copy

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

30. Switch working copy

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

32. Some time
passes...

33. Generate a release

34. Tag correct files
in correct branch
Hopefully the latest
release branch

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

36. Check out a tagged release

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

38. Merging

39. Trunk stays stable

40. Merge branches back to
trunk

41. Trunk
Merge
Branch

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

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

44. Good for spikes

45. Good for bug fixes

46. Love your IDE

47. IntelliJ IDEA
Eclipse
Komodo
emacs
vim

48. Bonus recipe!

49. Automated integration

50. SVN hooks
(just like CVS)

51. Automatic actions

52. Cruise Control

53. Harmony

54. Talk to SSG

56. slideshare.net/mza