SVN Project management: Branch Library and Merge library

I received PM's new mission last week to branch the main library.

First of all, look at the SVN default three folders, the three folders after the completion of the library, the general default will have, but the previous use, or relatively humble, almost all of us submitted to the trunk inside, the entire development process down, has been using this library.

So what are the three folders that should be used to put something?

         Branch (branching) The
             Branch starts with a copy of the main line, but then he will remain independent, have their own changes.
            Sometimes you need to create a branch, for example you need to develop a new feature, but you don't want the new feature to open
            the development of the main line before the completion of the hair.

Mark (Tagging)
A tag is a snapshot of a specific version in the repository. Usually when the project progresses to milestones or you are ready to post
Release version of the time you need to create a tag. Although it is possible to Commit a tag, the general
Do not do so.

merge (merging)
When branching is developed to a particular scenario, it is often necessary to merge the changes into the main line. For example, if
The heart function of the development of the fruit has been stable, then the branch can be merged into the trunk.

The project here is, the project is just on-line, but there are a lot of bugs, there are many new requirements, so the main library now put the code in a branch, and then we relocated to the branch library, modify the contents of the branch library. When the test passes, it is then merged into the main library.

how to branch?

In the checked out trunk directory of the project, select the branch (in fact, the branch and tag operation is very similar).

later, we look at the server, we will see the branch directory under the "branch Test 2";

To view the version branch chart:

you can see which version of each branch was branched out from.

Merge branch to trunk?

when we have multiple branches developed, it is necessary to merge back into the main library.

When the selection merge is complete, the local working copy is found to have changed to the uncommitted state.

at this point, we also have to submit a local working copy to be truly merged.

In fact, the management of SVN is more centralized management, and now many people use the centralized git compared to, svn very few branches ... N More ...

Finally, version control is not source management .... Everyone development please self-esteem ....

SVN Project management: Branch Library and Merge library