Original Address: https://blog.csdn.net/lisq037/article/details/17501327
Recently received project requirements, to create a branch on svn trunk with branches bug to modify the program, and the development of new features on the trunk. bug on the branch you modify, after release, can be merged into the trunk. Maintenance program while the project can switch between the trunk and branches to achieve the trunk and branches.
1. Create a branch
Creating a branch is to actually copy the program to a designated branch directory, the following illustration:
Right-click on the project name, the pop-up menu, select "Team", then select "Branch / Tag", the pop-up the following page:
The figure above "Copy to URL" fill in the path to create a new branch address, the program will copy back to the directory, the formation of new branches. Click "Next":
Select the most current version, click "Next"
If the check on the following FIG switch working copy to new branch / tag, eclipse program item will automatically switch to the next branch. Here we do not choose to be on their own switches.
This creates a 1.0 branch
2. Merge
May be incorporated into the branch from the trunk, may also be incorporated into the trunk from the branch can select appropriate options as needed, as shown below:
Image above options:
1) merge from the trunk to the branch
2) merge into the trunk from the branch
3) The modifications incorporated into the backbone of the branch
4) merge two branches to the trunk
5) from the trunk to the branch does not need to manually specify the combined modified
6) from the trunk to the branch, manually specify modifications to merge
The figure above shows without any modification, so do not be merged.
3. Switch
Right-click on the project name, select "Team" -> "switch to another Branch / Tag / Revision".
Select the destination address need to switch, you can click ok.
In this way, you can switch back and forth between the trunk and several branches in the project, to be modified to achieve different versions / branches that submit operations.