The document outlines the concept of parallel development and its various models using Distributed Version Control Systems (DVCS). It details the terminology related to branching, merging, and integration, while demonstrating use cases with tools like Git and Subversion. Additionally, it discusses the advantages and disadvantages of DVCS, emphasizing their importance in collaborative software development.

1. Liya Katz & Miron Gofer Parallel Development

2. Agenda What is Parallel Development? Solutions: branching models and more DVCS Use case and demo

3. What is Parallel Development? Terminology: Codeline Branch Merge Feature Freeze Code Freeze

4. Branching models files versioning and no branching branch by release branch by task branch by purpose

5. Files versioning and no branching Managing the history...

6. Branch by Release Release 1.0 Release 2.0 Release 3.0 Production 1.0 Production 2.0 Production 3.0 Development QA Production Release to QA Development QA Production Release to QA Development QA Production Approved bug fix Merge bug fix to release 2.0 Merge bug fix to release 3.0

7. Branch by Task Integration branch 1.0 Task 2 Task 1 Task 3 Integration Terminology: Integration codeline/branch Integration task + integrator role Deliver Rebase Production 1.0 QA Production

8. Branch by Purpose DEV Normal Development Feature Freeze Bridge Rrelease to QA (Code Feeze) ‏ Release candidate 1.0 Normal Development Testing Production 1.0 Approved bug fix

9. Additional solutions

10. Feature toggle

11. Private branching

12. DVCS Overview D istributed V ersion C ontrol S ystem D ecentralize

13. Key concepts Make (record) the changes and Share the changes are distinct operations

14. Key concepts Peer-to-Peer approach (We are equal)

15. Key concepts Construct your own structure (free as in freedom)

16. Key concepts Merge is good!!!

17. Key concepts New Terminology : Checkout, checkin, branch, log are all local actions. For collaboration we got: push, pull, clone...

18. DVCS Overview - cont. Advantages . . . Disadvantages . . . Does it fit?

19. DVC systems GIT Linux, X.org, Rails. Very fast very powerful. Bazaar Ubuntu Less known Mercurial OpenJDK, OpenSolaris, Mozilla. Better Windows support.

20. Demo Empower subversion with git private branching

21. Use case Central SVN repository Use local GIT repository for private branching on developer environment Use git-svn tool to glue

22. Demo steps Clone repository using command line: $ git svn clone http://dev.tikalk.com/svn/repos_private/trunk/promoted-builds-manual-demo/ -T ""

23. Demo steps Open eclipse, import the project and share with git:

24. Demo steps Make change on the master branch:

25. Demo steps Create new branch and checkout:

26. Demo steps Make changes on the new branch and commit:

27. Demo steps Checkout back to master sync with branch, merge and commit

28. Demo steps Rebase and commit to SVN from command line: $ git svn rebase $ git svn dcommit See in SVN history:

29. DEMO

30. Thank you