Branching and merging is easy with TortiseSVN, but remembering the right order of steps can be confusing. In this example I copy the trunk to a release candidate branch. Then I make changes based on feedback from the Testing/QC team. After all Testing/QC issues are resolved, a release tag is created from the branch. Finally changes in the branch are merged back into the main development trunk.
1. In SVN Browser, copy /trunk to /branches/rc-version
2. In Explorer, Switch working copy to /branches/rc-version
3. In Explorer, submit changes to /branches/rc-version
4. In SVN Browser, copy /branches/rc-version to /tags/version
5. In Explorer, switch working copy to /trunk (I always forget this one.)
6. In Explorer, Merge with “Reintegrate a branch” option. Select /branches/rc-version as your “From URL”
7. In Explorer, commit your working copy to the trunk.
8. In SVN Browser, delete the branch.
Branching and merging is easy with TortiseSVN, but remembering the right order of steps can be confusing. In this example I copy the trunk to a release candidate branch. Then I make changes based on feedback from the Testing/QC team. After all Testing/QC issues are resolved, a release tag is created from the branch. Finally changes in the branch are merged back into the main development trunk.
1. In SVN Browser, copy /trunk to /branches/rc-version
2. In Explorer, Switch working copy to /branches/rc-version
3. In Explorer, submit changes to /branches/rc-version
4. In SVN Browser, copy /branches/rc-version to /tags/version
5. In Explorer, switch working copy to /trunk (I always forget this one.)
6. In Explorer, Merge with “Reintegrate a branch” option. Select /branches/rc-version as your “From URL”
7. In Explorer, commit your working copy to the trunk.
8. In SVN Browser, delete the branch.
Like this:
Be the first to like this post.
