SVN version control trunk branch tag

ArticleDirectory

• Error: Can't connect to host '': Unable to connect because the target machine is actively rejected

 

 

Install and configure an SVN independent server in Linux

Http://jijian91.com/blog20061020/svn-subversion-install-configure.html

 

Error: Can't connect to host '': Unable to connect because the target machine is actively rejected

Solution:

 

The server is installed on Linux.
Add (-A RH-Firewall-1-INPUT-M state -- state new-m tcp-p tcp -- dport 3690-J accept) on the last line in/etc/sysconfig/iptables.

 

 

Three methods for installing SVN plug-in myeclipse6.5

Http://blog.csdn.net/chenhu900101/archive/2009/12/11/4987011.aspx

 

 

 

-- Simple comparison

The working mechanism of SVN is like a growing tree to some extent:

• A tree with trunk and many branches
• Branches grow out of the trunk, and the branches grow out of the thick trunk.
• A tree can only have a trunk without branches (but it will not last for a long time. As the tree grows, there will certainly be branches, ^)
• A tree with no trunk but many branches looks more like a bundle of branches on the floor
• If the trunk is diseased, the final Branch will also be affected, and then the entire tree will die.
• If the branch is ill, you can cut it off and the other branches will grow!
• If the branch grows too fast, it may be very heavy for the trunk, and the entire tree will collapse.
• When you feel that your tree, trunk, or branch looks pretty, you can take a photo of it so that you can remember how nice it was at that time.

-- Trunk

Trunk is placed stablyCodeThe main environment is like a car factory, responsible for assembling finished car parts together.

The following describes how to use SVN trunk:

• Unless you have to handle bugs that are easy to solve quickly, or you have to add unrelated files (such as media files: images, videos, CSS, etc ), otherwise, do not directly develop in trunk
• Do not make too many changes to the previous version because of special requirements. How to Create a branch is required (as described below)
• Do not submit some contents that may destroy trunk, such as merging from Branch
• If you accidentally break the trunk, bring some cake the next day ("with great responsibilities come... Huge cakes ")

-- Branches

A branch is a normal copy made from a sub-tree in a SVN repository. Generally, it works like symbolic links on Unix systems, but once you modify some files in a SVN branch, in addition, these modified files develop independently from the copied source files, so we cannot think so. When a branch is completed and it is considered stable enough, it must be merged back to its original copy, that is, if it was originally copied from trunk, it should be returned to trunk, or merged back to its original copied parent-level branch.

The following describes how to use SVN branches:

• If you need to modify your applicationProgramOr develop a new feature for it. Create a new branch from trunk and then develop it based on the new branch.
• Unless a new sub-branch must be created from a branch, the new branch must be created from the trunk
• When you create a new branch, you should immediately switch over. If you didn't do this, why did you create this branch in the original place?

-- Tags

On the surface, there is no difference between SVN branches and SVN tags, but there are many differences in concept. In fact, a SVN tags is the "photo of this tree" described above: A trunk or a branch revision named snapshot.

The following describes how to use SVN tags:

• As a developer, you should never switch to or retrieve it, or submit anything to a SVN tag: a tag is like a "photo". It is not a real thing. tags is only readable, not writable.
• In special or special environments, such as: production environment ),? (Staging), test environment (testing), etc., can only be checkout and update from a fixed (fixed) Tag, never commit to a tag.
• For the environment mentioned above, you can create the following tags: "production", "staging", "testing", and so on. You can also name tags Based on the software version and project maturity: "1.0.3", "stable", and "latest.
• When the trunk is stable and can be released, you must recreate the tags and then update the related environment (production, staging, etc)

-- Workflow example

Assume that you have to add a feature to a project and the project is under version control. You need to complete the following steps:

1. Use SVN checkout or SVN switch to obtain a new working copy (Branch) from the trunk of this project)
2. Switch to the new branch using SVN
3. Complete new feature development (of course, do enough tests, including before coding)
4. Once this feature is complete and stable (submitted), and confirmed by your colleagues, switch to trunk
5. Merge your branches to your work copy (trunk) and resolve a series of conflicts.
6. Re-check the Merged Code
7. If possible, ask your colleagues to review the code you have written and changed)
8. Copy the merged job to trunk.
9. If some deployment requires a special environment (such as the generation environment), update the related tag to the revised version you just submitted to trunk.
10. Use SVN update to deploy to related environments