|
Trunk |
|
The trunk contains the most current code. It is sometimes the exact code that is running in production. There's only one trunk in your repository, take care of it. You shouldn't use trunk to fix bugs or create new features. |
|
===The trunk is only used to create branches, tags and releases.=== |
|
|
|
Branch |
|
Branches are a copy of the trunk. These branches are created independently and can be used to add, modify or delete features to the current code and to fix bugs. There two (2) types of branches you can create Feature Branches and Bug Fix Branches. |
|
|
|
Feature Branches |
|
The Feature branch is mainly use to add, modify or delete feature to your current code. |
|
Bug Fix Branches |
|
The "Bug Fix" branch is mainly to fix bugs found by QA or you in the current code (trunk). |
|
|
|
Tags |
|
Tags are like branches but are not used for development. They are "snapshot" with a name of a specific revision of the trunk, or of a branch. Tasgs are usually immutable release/patch |
|
|
|
Releases |
|
Releases are combined branches ready to be tested and pushed to production or other environments. |
|
|
|
The naming convention for these releases should follow a date/time standard. |
|
e.g. use PROD-20130101-1300 for a release to Production on Jan 1, 2013 at 1:00 pm |
|
|
|
Naming branches and tags: |
|
The naming convention for branches and tags should have a clear easy to understand system. The naming convention for tags should follow the same logic as the branches. |
|
|
|
e.g |
|
/svn/project/branches/feature-302/ |
|
/svn/project/branches/bugfix-2.0.3.2/ |
|
/svn/project/tags/1/ |
|
/svn/project/tags/PROD-0101 |
|
|
|
|
|
Reference Links: |
|
http://bookofzeus.com/articles/organize-your-svn-repository/ |
|
http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-branchtag.html |
|
http://janvanbesien.blogspot.com/2009/06/consistent-svn-brach-and-tag-names-for.html |
|
http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-branchtag.html |
|
http://stackoverflow.com/questions/16142/what-do-branch-tag-and-trunk-mean-in-subversion-repositories |
|
http://mayeul.com/svn-branching-practices/ |
|
http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.4.1 |
|
http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-branchtag.html |
|
http://blog.jmfeurprier.com/2010/02/08/svn-trunk-branches-and-tags/ |
|
|
|
|
|
|
|
|
|
|
