Subversion and Subclipse: Beyond Commit and Update Part II

1
Subversion and Subclipse Beyond Commit and
Update(Part II)

• ACFUG June 2007
• Scott Talsma
• CTO, echoeleven

2
Advanced Operations

• Tagging and Branching
• Merging
• Client Branch
• Bug Branch
• Feature Branch
• Rollback

3
Projects

• /trunk
• holds the main line of development
• /tags
• snapshot of a project in time
• /branches
• contain branch copies
• tweaked copies of trunk
• Example client branch

4
Client Branch

• Branch from trunk
• Process
• Check out client branch
• Make client-specific changes in working copy (of
  client branch)
• Commit
• Export client branch for deployment

5
Merging

• Merges repository changes into working copy on
  client
• Working copy should (must) be up to date
• No additional developer changes
• Pick a part of repository tree, specify begin/end
  revision numbers
• Example Feature branch

6
Feature branch

• Temporary branch created to work on a complex
  change without interfering with the stability of
  /trunk
• Process
• Create branch
• Checkout branch
• Use feature branch as working copy
• Commit to feature branch
• Merge committed feature branch to /trunk when
  complete
• Merge trunk to client branch to propigate new
  features

7
Bug Branch

• Process
• Create new branch
• Tag branch (e.g. PreIssue103)
• Checkout branch, fix bug, commit
• Tag branch (e.g. PostIssue103)
• Use two tags to merge back to all other affected
  branches (e.g. /trunk)

8
Rollback

• Backwards merge of branch into self
• Essentially reverse playback of changes
• Start revision is HEAD
• End revision is stopping point
• Start gt End