Page History: Branching, Tagging, and Merging - Subversion

Compare Page Revisions

7 6 5 4 3 2 1 0 Current 7 6 5 4 3 2 1 0

« Older Revision - Back to Page History - Newer Revision »

Page Revision: Wed, Sep 25, 2013, 1:21 PM

Overview¶

This article gives a walk-through of using the branching, tagging, and merging features in Subversions via the Tortoise SVN client for Windows.

• WC: — this prefix indicates the root folder of your working copy (on your local drive)
• RB: — this prefix indicates the root folder within the Subversion Repository Browser
  

Walk-Through¶

1. Setup project repository
2. Add folders: branches, tags, and trunk
3. Create YourName.html file in WC:/trunk folder
4. Commit to SVN
5. Revise YourName.html with content showing "RC 1"; commit.
6. Tag HEAD revision as "RC 1"
   • Windows Explorer > right click "trunk" folder > Tortoise SVN > Branch/tag
   • From WC/URL = .../trunk
   • To path = "/tags/RC-001"
   • Create copy in the repository from = HEAD revision in the repository
   • OK button
   • Repo browser now shows "/tags/RC-001" folder (may have to refresh)
7. Edit WC:/trunk/YourName.html; commit.
8. Open RB:/trunk/YourName.html - you should see your latest changes
9. Open RB:/tags/RC-001/YourName.html - you should see RC-001 content
10. Get Latest - In Windows Explorer
    • Right click *root* folder (parent of branches, tags, and trunk) > SVN Update...
    • Should now see /tags/RC-001 folder
11. Fix bug in RC-001
    • Windows Explorer > right click "/tags/RC-001" folder > Tortoise SVN > Branch/tag
    • From WC/URL = ".../tags/RC-001"
    • To path = "/branches/RC-001.1"
    • Create copy in the repository from = Speicific revision in repository (accept default revision)
    • OK button
    • Repo Browser now shows "/branches/RC-001.1" folder (may have to refresh)
12. Get latest
    • Windows Explorer > right click "/branches/RC-001.1" > SVN Update...
    • Should now see WC:/branches/RC-001.1 folder
13. Edit WC:/branches/RC-001.1/YourName.html, adding content to indicate a bug fix for "RC 1.1"
14. Commit WC:/branches/RC-001.1
15. Open RB:/branches/RC-001.1/YourName.html -- should see RC 1.1 content
16. Merge your branch back into trunk
    • WC:/trunk/YourName.html > right click > Tortoise SVN > Merge...
    • Merge Type = "Merge a range of revisions" > Next button
    • URL to merge from = RB:/branches/RC-001.1/YourName.html
    • Revision range to merge = leave blank
    • Working copy = leave as default
    • Next button
    • Test merge button
    • (accept defaults)
    • Merge button
17. Open RB:/trunk/YourName.html - Should see RC 1 content
18. Open WC:/trunk/YourName.html - Should see RC 1.1 content