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:16 PM

Setup project repository 
Add folders: branches, tags, and trunk
Create YourName.html file in WC:/trunk folder
Commit to SVN
Revise YourName.html with content showing "RC 1"; commit.
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)
Edit WC:/trunk/YourName.html; commit.
Open RB:/trunk/YourName.html - you should see your latest changes
Open RB:/tags/RC-001/YourName.html - you should see RC-001 content
Get Latest - In Windows Explorer
    Right click *root* folder (parent of branches, tags, and trunk) > SVN Update...
    Should now see /tags/RC-001 folder
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)
Get latest
    Windows Explorer > right click "/branches/RC-001.1" > SVN Update...
    Should now see WC:/branches/RC-001.1 folder
Edit WC:/branches/RC-001.1/YourName.html, adding content to indicate a bug fix for "RC 1.1"	
Commit WC:/branches/RC-001.1
Open RB:/branches/RC-001.1/YourName.html -- should see RC 1.1 content
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
Open RB:/trunk/YourName.html - Should see RC 1 content
Open WC:/trunk/YourName.html - Should see RC 1.1 content