Compare Page Revisions
« Older Revision - Back to Page History - Newer Revision »
Setup project repository Add folders: branches, tags, and trunk Create index.html file in WC:/trunk folder Commit to SVN Revise index.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/index.html; commit. Open RB:/trunk/index.html - you should see your latest changes Open RB:/tags/RC-001/index.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/index.html, adding content to indicate a bug fix for "RC 1.1" Commit WC:/branches/RC-001.1 Open RB:/branches/RC-001.1/index.html -- should see RC 1.1 content Merge your branch back into trunk WC:/trunk/index.html > right click > Tortoise SVN > Merge... Merge Type = "Merge a range of revisions" > Next button URL to merge from = RB:/branches/RC-001.1/index.html Revision range to merge = leave blank Working copy = leave as default Next button Test merge button (accept defaults) Merge button Open RB:/trunk/index.html - Should see RC 1 content Open WC:/trunk/index.html - Should see RC 1.1 content
ScrewTurn Wiki version 3.0.1.400. Some of the icons created by FamFamFam. Except where noted, all contents Copyright © 1999-2024, Patrick Jasinski.