Create Branch/merge/switch usage for SVN under eclipse

Recently in the process of Project versioning and SVN branch management, take some notes.

1. Create a branch

Creating a branch is actually a copy of the program to the specified branch directory, as shown in:

(To facilitate rollback of the project, you can create a branch of the code that is successfully launched.)

Right click on the project name, pop-up menu, select "Team", then "Branch/tag", pop up the following page:

The copy to URL in will fill in the path address where the new branch is created, followed by a copy of the program to that directory, forming a new branch. Click "Next":

Select the current version and click "Next"

If you tick the following switch working the program project for copy to new branch/tag,eclipse will automatically switch to the branch. We do not choose here, we will switch ourselves later.

This creates a 1.0 branch.

2. Merging

You can merge from the trunk to the branch, or you can merge from the branch to the trunk, optionally selecting the appropriate options, such as:

The options in:

1) Merge from trunk to branch

2) Merge from branch to trunk

3) Merge the changes on the trunk to the branch

4) Merge 2 branches to trunk

5) Manually specify modifications that do not need to be merged from the trunk to the branch

6) manually specify the modifications to merge from the trunk to the branch

I'm using: Merging 2 branches into the trunk

The display does not have any changes, so there is no need to merge, and if modified, select "Next" to appear.

Is the most critical step: I think that merging is actually covering the content of one branch to another,

, 106 and 107 are all branches according to 1.1.1, 106 version number is 130, 107 version number is 131,

After the developer submits the 106 version number becomes 266, and the 107 version number becomes 302. Now we want to put the 106 branch

Cover up to 107, but if 107 has also been modified, the reservation cannot be overwritten, and the same file will need to be manually resolved.

We need to put 107 in the address bar above, then choose the original version number 131 (should show 132), the nonsense is not said.

3. Toggle

Right-click on the project name and select "Team" –> "switch to another branch/tag/revision".

Select the destination address you want to switch to, click OK.

In this way, you can switch between the trunk and several branches in the project to implement the modified commit operation for the different versions/branches of the program.

Create a branch/merge/switch using SVN under Eclipse