SVN version control and branch settings

Use Svn+eclipse to do software version control.

1,SVN directory Structure

Trunk: Skeleton directory, files in this directory are base files
Branches: Branch Directory for development
Tags: The version directory for publishing

is a directory structure that is viewed based on the Eclipse SVN repositores

(Figure 1: directory structure)

2, version of the branch

Branches definition Rules: Project name + datetime + feature points, such as sns-home_20090506_profile, you must add labels when creating each branch.

3, create a new branch

(Figure 2: Start creating a branch)

(Figure 3: Select the branch name and SVN resource path)

(Figure 4: Choose to start branching from head revision or specified revision)

(Figure 5: You must add a callout to this branch)


(Image 5 _ 1: Callout Branch)

4, merging from branch to trunk

1, when the branch version has been developed and tested, can be merged through Subeclipse to the trunk, you can merge the entire project can also be combined with a single file, such as

(Image 8: Multiple branches are changed)

2, if the Hi.java file has changed, then we will select the *trunk* under the Hi.java file (note is not under the branch Hi.java), and then right-click to select the Team->merge command

(Figure 9: Start merge)

3, select the merge pop-up following dialog box, specify the following,

1. First red Box
   1. The above section selects the file (project) on the corresponding branch of the current file (project), which can be selected by the following Select button
   2. The following section selects the starting version of the merge, which is generally OK when the branch is established, (which version is known based on the comments that were filled in when the branch was established)

1. The second red box is selected by default and can be used without a tube
2. The third red box is to select a stable version on the branch
   1. If the final version is determined to be stable, tick "Merge to HEAD revision"
   2. If the final version is not stable, then you can choose a stable version of the previous one, you can select it by following the Select button

Click "Merge" after confirmation and start the merge operation.

(Figure 10: Select a branch and the start and end versions of the branch)

4, after the completion of the merge, the files under the local trunk will be updated, note that this is only merged locally, and you will need to check again if the merged files are correct, and then use Team->commit to submit the merged content after reconfirmation.

5, the proposed merger, and then under the trunk of the modified content to test, it is best to a point at a point of testing, to ensure that the merged content is stable and correct.

5, mark the new version

(Figure 6: Path to the new version)

(Figure 7: Definition rules for the new version)

(Image 11: Tag after merging)

6, references

Http://subclipse.tigris.org/branch_tag.html
Http://wenku.baidu.com/view/a03f2aeab8f67c1cfad6b8d3.html

7, PostScript

Alpha: It's an internal beta version., generally not externally published, there will be manyBugs. Typically only testers are used.

Beta: is also beta, this phase of the version will always add new features. InThe alpha version is available later.

RC:(ReleaseCandidate) as the name implies?! Used in software is the candidate version. The release candidate version is on the system platform.RC version will no longer add new features, mainly focus on debugging.

Ga:general availability, officially released version, is used abroadGA to illustrateRelease version of the.

Rtm:(Release to manufacture) is the version of the factory a lot of pressure, the content is the same as the official version, butThe RTM version also has a limited, evaluation version. But the main program code is the same as the official version.

OEM: is for computer manufacturers with the computer to sell, that is, random version. can only be shipped with the machine, not retail. Only new installations can be installed and cannot be upgraded from an older operating system. Packaging is not as beautiful as the retail version, usually only one sideCD and Instructions(Authorization Letter)。

RVL: As the official version, in factRVL is not the name of the version at all. It is Chinese version/English version of the document cracked out.

EVAL: While circulating on the networkEval version, withThe evaluation version"Similarly, there is no difference between functional and retail editions.

Rtl:Retail editionIs the real official version, the official shelves of the retail version. On the installation disk,i386 folder has a eula.txt, and finally a row eulaid" is your   version. For example, the official version of Simplified Chinese is eulaid:wx.4_pro_rtl_cn, the official version of Traditional Chinese is wx.4_pro_rtl_tw. Where: If it is wx. The beginning is the   official version, wb. Start with Beta. _pre, representing the family edition, _pro, representing the Professional edition.

α, β, λ commonly used to represent three stages in software testing   over  , α is the first stage, Generally only for internal testing purposes; β is the second phase, has eliminated most of the imperfections in the software, but there may still exist defects and vulnerabilities, generally only to   specific user groups to test the use of , λ is the third stage, at this time the product has been quite mature, only in a few places to do further optimization processing can be listed and released.

SVN versioning and branching settings