Source:
http://blog.9cbs.net/zhuhl520/archive/2005/02/05/281901.aspx
Our project will usually release a version at a certain stage, and we will continue to develop the next version. If this time the client is being used, we certainly need to change the bug, and release the customer Update patch package. At this time, you need to create a branch of this version. After the branch is created, we also need to remove this bug in our future versions. Therefore, you need to merge this branch to our next version, that is, the HEAD workspace we are currently using. Therefore, the ideal process is: Release version A1.0 ---> Continue to develop the next version A1.1 ----> Version A1.0 Discover the existence bug ----> Checkout This version, modify the existing bug - -> Create a branch BRANCH_A1.0_BUG1 ---> Release Update Patch ---> Merge branches into the main workspace. Use steps in Eclipse: 1. Select the item, click Right click -> Team ---> Tag As Version .... This step creates a version 2. Continue to develop the next version of the project 3, the customer finds a bug, check out the version being running. Select a project, right click -> Replace with ---> another branch or version, select the version being used by the customer. 4. Modify the program in the current work space (customer run version) to complete the bug modification. 5. Create this version of the branch, select the item, click Right click ---> Team ----> branch .... Create a branch that modifies the bug. 6, release the update patch to the customer. 7, incorporate this branch into the backbone. A Select a project, right click -> Replace with ----> Another Branch OR Version, select Head, load the main version. B Select the project, click Right click -> Team ---> Merge ..., select the starting version, that is, the customer A1.0 version, select the next step, then select Branch Branch_a1.0_bug1, then click Finish. This branch change will be displayed in the CVS view, incorporate these changes into the workspace, so the main work version has also modified the bug. 8, everything is completed, synchronized, submitted. Note: Branch merge is different between comparison versions A1.0 and the branches under this version, merge these differences into Head.
