Trunk, branch and tags in SVN

August 22, 2021By Simo SVN

Reposted from: https://www.cnblogs.com/keyi/p/5953649.html

I believe that when beginners develop SVN as version management, it is estimated that it is impossible to consider how to use SVN flexibly to manage the version of the development code. Below I will extract an article to briefly explain the trunk, branched, and tags in SVN. The usage of the three file directories.

I will explain in detail how I use SVNtrunk (trunk), branches (branch) and tags (tags). This method is also called “branchalways”, and the two are very close. Maybe what I have introduced is not the best method, but it will give newbies some explanations, tell them what trunk, branches, and tags are, and how to apply them.

——Simple comparison

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

A tree with a trunk and many branches

Branches grow from the trunk, and thin branches grow from a relatively thick trunk

A tree can only have a trunk without Branch (but this situation will not last long, as the tree grows, there will definitely be branches, ^^)

A tree without a trunk but with many branches looks more like on the floor A bunch of branches of the tree

If the trunk is sick, the branches will eventually be affected, and then the whole tree will die.

If the branch is sick, you can cut it, Then other branches will grow out!

If the branch grows too fast, it may be very heavy for the trunk, and eventually the whole tree will collapse.

When you feel that your tree, trunk or branch looks very When it’s beautiful, you can take a picture of it so that you can remember how awesome it was at that time.

——Trunk

SVN constitutes Trunk. Trunk is the main environment for placing stable codes, just like an automobile factory, responsible for assembling finished car parts Together.

The following will tell you how to use SVNtrunk:

Unless you have to deal with some bugs that are easy and quick to solve, or you have to add some unrelated logic files (such as media files: Images, videos, CSS, etc.), otherwise you should never develop directly in the trunk

Don’t make too many changes to the previous version because of special needs. Any relevant situation means the need to build A branch (described below)

Do not submit some content that may damage the trunk, such as merging from the branch

If you accidentally damage the trunk at some point, bringsomecakethenextday(“withgreatresponsibilitiescome) …Hugecakes”)

——Branches

SVN forms branches, and a branch is an ordinary copy made from a subtree in an SVN warehouse. Normally, it works like symbolic links on UNIX systems, but once you modify some files in an SVNbranch, and these modified files develop independently from the copied source files, you can’t think so. When a branch is completed and it is considered stable enough, it must be merged back to where it was originally copied, that is to say: if it was originally copied from the trunk, it should go back to the trunk, or merge back to its original The parent branch of the copy.

The following will tell you how to use SVNbranches:

If you need to modify your application or develop a new feature for it, please create a new branch from the trunk , And then develop based on this new branch

Unless it is because a new branch must be created from a branch, the new branch must be created from the trunk

When you create You should switch to a new branch immediately. If you didn’t do this, why did you create this branch in the first place?

——Tags

SVN composes Tags. On the surface, there is no difference between SVNbranches and SVNtags, but conceptually, they have many differences. In fact, an SVNtags is the “photograph of this tree” mentioned above: a named snapshot of a trunk or a branch revision.

The following will tell you how to use SVNtags:

As a developer, never switch to, retrieve, or submit anything to an SVNtag: a tag is like a kind of “photo” “Is not a real thing, tags are only readable, not writable.

In a special environment or an environment that requires special attention, such as: production environment (production),? (Staging), test environment (testing), etc., can only 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 according to the software version and the maturity of the project: “1.0.3”, “stable”, “latest” and so on.

When the trunk is stable and can be released to the outside world, the tags must be recreated accordingly, and then the relevant environment (production, staging, etc) must be updated

< div> ——workflow sample

Assuming that you have to add a feature to a project, and the project is under version control, you almost need to complete the following steps:

Use SVNcheckout or SVNswitch to obtain a new working copy (branch) from the trunk of this project

Use SVN to switch to the new branch

Complete the development of new features (of course, to do Enough testing, including before starting coding)

Once this feature is completed and stable (submitted), and confirmed by your colleagues, switch to trunk

Merge your branch To your working copy (trunk) and resolve a series of conflicts A review of the code (review)

Submit the merged working copy to the trunk

If some deployment requires a special environment (generation environment, etc.), please update the relevant tag to The revised version you just submitted to the trunk, use SVNupdate to deploy to the relevant environment

Introduction
1. We all know that SVN is a software that manages the source code of a project. It can record the code of each stage of our development for us later To use it, do you know the specific structure of SVN? Now let’s introduce its basic structure

Trunk, Branches, Tags, function
1. Trunk
  1. This is the main branch of the SVN directory, which represents projects under daily development, and anytime in Trunk All the latest development codes are included. The code here will work until your next major release.
  2. Trunk should only be used to develop code that will become your next major version.
  3. Almost often people only use trunk to store their code. After a version is released, the next version will be developed on it. This development is mixed. If there is a big bug, it is often difficult to restore to the previous version. Therefore, a Branches file is added.
1. Branches
  1. There are several types of commonly used Branches, here are the commonly used ones.
  2. Release Branches
    1. When the trunk reaches the stage of preparing for release (or when you want to freeze the addition of new features), you should create a release branches.
  1. Bug fix branches
    1. Branches can also be used to deal with serious bugs found in trunk or release branches.
  1. Experimental branches
    1. Sometimes you want to introduce a new technology into a project. This is great, but of course you don’t want to bet on your entire project. Imagine you want to change your web application from PHP4 to PHP5. How much time will you spend? During this period, your trunk will stop using? Until you finish all the conversion to PHP5
1. Tags
  1. Under normal circumstances, a tag is used to make a milestone, whether it is a release or not, it is a usable version. Here, it should be read-only.
  2. In SVN, there is no obvious difference between Tags and Branches when they are created in one option. What is stored in Tags is also a copy of Trunk, which is only read-only and cannot be modified. The permissions are different.

Trunk, Branches, Tags detailed use
1. Trunk
  1. Right click in the folder and select “Create repository here”

I believe in beginner development When SVN is used as version management, it is estimated that it is impossible to consider how to flexibly use SVN to manage the version of the developed code. Below I will extract an article to briefly explain the usage of the three file directories of trunk, branched, and tags in SVN. .

——Simple comparison

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

A tree with a trunk and many branches

Branches grow from the trunk, and thin branches grow from a relatively thick trunk

A tree can only have a trunk without Branch (but this situation will not last long, as the tree grows, there will definitely be branches, ^^)

A tree without a trunk but with many branches looks more like on the floor A bunch of branches of the tree

If the trunk is sick, the branches will eventually be affected, and then the whole tree will die.

If the branch is sick, you can cut it, Then other branches will grow out!

If the branch grows too fast, it may be very heavy for the trunk, and eventually the whole tree will collapse.

When you feel that your tree, trunk or branch looks very When it is beautiful, you can take a picture of it so that you can remember how awesome it was at that time.

——Trunk

SVN constitutes Trunk. Trunk is the main environment for placing stable codes, just like an automobile factory, responsible for assembling finished car parts Together.

The following will tell you how to use SVNtrunk:

Don’t make too many changes to the previous version because of special needs. Any relevant situation means the need to build A branch (described below)

Do not submit some content that may damage the trunk, such as merging from the branch

If you accidentally damage the trunk at some point, bringsomecakethenextday(“withgreatresponsibilitiescome) …Hugecakes”)

——Branches

The following will tell you how to use SVNbranches:

If you need to modify your application or develop a new feature for it, please create a new branch from the trunk , And then develop based on this new branch

Unless it is because a new branch must be created from a branch, the new branch must be created from the trunk

When you create You should switch to a new branch immediately. If you didn’t do this, why did you create this branch in the first place?

——Tags

The following will tell you how to use SVNtags:

As a developer, never switch to, retrieve, or submit anything to an SVNtag: a tag is like a kind of “photo” “Is not a real thing, tags are only readable, not writable.

In special environments or environments that require special attention, such as: production environment (production),? (Staging), test environment (testing), etc., can only checkout and update from a fixed (fixed) tag, never commit to a tag.

When the trunk is stable and can be released to the outside world, the tags must be recreated accordingly, and then the relevant environment (production, staging, etc) must be updated

< div> ——workflow sample

Assuming that you have to add a feature to a project, and the project is under version control, you almost need to complete the following steps:

Use SVNcheckout or SVNswitch to obtain a new working copy (branch) from the trunk of this project

Use SVN to switch to the new branch

Complete the development of new features (of course, to do Enough testing, including before starting coding)

Once this feature is completed and stable (submitted), and confirmed by your colleagues, switch to trunk

Merge your branch To your working copy (trunk) and resolve a series of conflicts A review of the code (review)

Submit the merged working copy to the trunk

Introduction
1. We all know that SVN is a software that manages the source code of a project. It can record the code of each stage of our development for us later To use it, do you know the specific structure of SVN? Now let’s introduce its basic structure

Trunk, Branches, Tags, function
1. Trunk
  1. This is the main branch of the SVN directory, which represents projects under daily development, and anytime in Trunk All the latest development codes are included. The code here will work until your next major release.
  2. Trunk should only be used to develop code that will become your next major version.
  3. Almost often people only use trunk to store their code. After a version is released, the next version will be developed on it. This development is mixed. If there is a big bug, it is often difficult to restore to the previous version. Therefore, a Branches file is added.
1. Branches
  1. There are several types of commonly used Branches, here are the commonly used ones.
  2. Release Branches
    1. When the trunk reaches the stage of preparing for release (or when you want to freeze the addition of new features), you should create a release branches.
  1. Bug fix branches
    1. Branches can also be used to deal with serious bugs found in trunk or release branches.
  1. Experimental branches
    1. Sometimes you want to introduce a new technology into a project. This is great, but of course you don’t want to bet on your entire project. Imagine you want to change your web application from PHP4 to PHP5. How much time will you spend? During this period, your trunk will stop using? Until you finish all the conversion to PHP5
1. Tags
  1. Under normal circumstances, a tag is used to make a milestone, whether it is a release or not, it is a usable version. Here, it should be read-only.
  2. In SVN, there is no obvious difference between Tags and Branches when they are created in one option. What is stored in Tags is also a copy of Trunk, which is only read-only and cannot be modified. The permissions are different.

Trunk, Branches, Tags detailed use
1. Trunk
  1. Right click in the folder and select “Create repository here”
  1. Tags
    1. The tags are similar to branches, same as above.
1. Meaning
  1. SVN solves the problems we face in data backup, version control, data synchronization, etc., so it is loved and used by many people. It is a good software tool for managing knowledge.
  1. We can also use SVN to manage our knowledge.

I believe that beginner development is not likely to be considered when SVN is used as version management On how to flexibly use SVN to manage the version of the development code, I will excerpt an article below to briefly explain the usage of the three file directories of trunk, branched, and tags in SVN.

——Simple comparison

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

A tree with a trunk and many branches

Branches grow from the trunk, and thin branches grow from a relatively thick trunk

A tree can only have a trunk without Branch (but this situation will not last long, as the tree grows, there will definitely be branches, ^^)

A tree without a trunk but with many branches looks more like on the floor A bunch of branches of the tree

If the trunk is sick, the branches will eventually be affected, and then the whole tree will die.

If the branch is sick, you can cut it, Then other branches will grow out!

If the branch grows too fast, it may be very heavy for the trunk, and eventually the whole tree will collapse.

When you feel that your tree, trunk or branch looks very When it is beautiful, you can take a picture of it so that you can remember how awesome it was at that time.

——Trunk

SVN constitutes Trunk. Trunk is the main environment for placing stable codes, just like an automobile factory, responsible for assembling finished car parts Together.

The following will tell you how to use SVNtrunk:

Don’t make too many changes to the previous version because of special needs. Any relevant situation means the need to build A branch (described below)

Do not submit some content that may damage the trunk, such as merging from the branch

If you accidentally damage the trunk at some point, bringsomecakethenextday(“withgreatresponsibilitiescome) …Hugecakes”)

——Branches

The following will tell you how to use SVNbranches:

If you need to modify your application or develop a new feature for it, please create a new branch from the trunk , And then develop based on this new branch

Unless it is because a new branch must be created from a branch, the new branch must be created from the trunk

When you create You should switch to a new branch immediately. If you didn’t do this, why did you create this branch in the first place?

——Tags

The following will tell you how to use SVNtags:

As a developer, never switch to, retrieve, or submit anything to an SVNtag: a tag is like a kind of “photo” “Is not a real thing, tags are only readable, not writable.

When the trunk is stable and can be released to the outside world, the tags must be recreated accordingly, and then the relevant environment (production, staging, etc) must be updated

< div> ——workflow sample

Assuming that you have to add a feature to a project, and the project is under version control, you almost need to complete the following steps:

Use SVNcheckout or SVNswitch to obtain a new working copy (branch) from the trunk of this project

Use SVN to switch to the new branch

Complete the development of new features (of course, to do Enough testing, including before starting coding)

Once this feature is completed and stable (submitted), and confirmed by your colleagues, switch to trunk

Merge your branch To your working copy (trunk) and resolve a series of conflicts A review of the code (review)

Submit the merged working copy to the trunk

Introduction
1. We all know that SVN is a software that manages the source code of a project. It can record the code of each stage of our development for us later To use it, do you know the specific structure of SVN? Now let’s introduce its basic structure

Trunk, Branches, Tags, function
1. Trunk
  1. This is the main branch of the SVN directory, which represents projects under daily development, and anytime in Trunk All the latest development codes are included. The code here will work until your next major release.
  2. Trunk should only be used to develop code that will become your next major version.
  3. Almost often people only use trunk to store their code.发放了一个版本后继续在其上进行下一版开发。这样开发是混论的，如果出现大的Bug往往不好恢复到之前版本，因此，增加了一个Branches文件
1. Branches
  1. 常用的Branches分支有好几种类型，这里列出常用的几种。
  2. Release Branches
    1. 当trunk达到准备发布的阶段时（或者你想冻结新特色的添加时），你应该创建一个release branches。
  1. Bug fix branches
    1. 分支也可以用于处理trunk或release branches里发现的严重的Bug。
  1. Experimental branches
    1. 有时你想将某个新技术引进项目。这很好，但是你当然不想赌上你的整个项目。想象一下，你想把你的Web程序从PHP4改为PHP5。你要花多少时间？在这期间你的trunk停止使用？直到你把所有到PHP5的转换做完
1. Tags
  1. 一般情况下，tag，是用来做一个milestone的，不管是不是release，都是一个可用的版本。这里，应该是只读的。
  2. 在SVN中Tag和Branches，在一个选项里面创建时区别不明显，Tags中存放的也是Trunk的一个副本，只不过是只读的，不可以修改，权限不同。

Trunk、Branches、Tags详细使用
1. Trunk
  1. 文件夹中右键，选“Create repository here”
  1. 选择“Create folder Structure”，然后，浏览建好的文件结构
1. Branches
  1. Create
  1. Merge
    1. Branches To Trunk
      1. 这种方式用的最多,属于常用的一种。
      2. 在Trunk中,选中UI文件夹，右键
      1. 如下图，选择”merge”
      1. 选择“Merge a range of revisions”
      1. 选择要合并的目录，这里选择branches中UI文件夹
    1. Trunk To Branches
    1. Branches To Branches
1. Tags
  1. 标记同branches类似,同上.

意义
1. SVN解决了我们数据备份、版本控制、数据同步等面对的问题，因而深受很多人喜爱和使用，它是一个不错的管理知识的软件工具。
1. 我们自己也可以用SVN管理我们的知识。

我相信初学开发在SVN作为版本管理时，都估计没可能考虑到如何灵活的运用SVN来管理开发代码的版本，下面我就摘录一篇文章来简单说明SVN里的trunk,branched,tags这个三个文件目录的用法。

我将会详细说明我是如何应用SVNtrunk(树干)、branches(分支)和tags(标记)。这种方法同样被称为“branchalways”，两者非常接近。可能我所介绍的并不是最好的方法，但是它会给新手一些解释说明，告诉他们trunk、branches和tags是什么，并且该如何去应用它们。

——简单的对比

SVN的工作机制在某种程度上就像一颗正在生长的树：

一颗有树干和许多分支的树

分支从树干生长出来，并且细的分支从相对较粗的树干中长出

一棵树可以只有树干没有分支（但是这种情况不会持续很久，随着树的成长，肯定会有分支啦，^^）

一颗没有树干但是有很多分支的树看起来更像是地板上的一捆树枝

如果树干患病了，最终分支也会受到影响，然后整棵树就会死亡

如果分支患病了，你可以剪掉它，然后其他分支还会生长出来的哦！

如果分支生长太快了，对于树干它可能会非常沉重，最后整棵树会垮塌掉

当你感觉你的树、树干或者是分支看起来很漂亮的时候，你可以给它照张相，这样就就可以记得它在那时是多么的赞。

——Trunk

SVN组成Trunka，Trunk是放置稳定代码的主要环境，就好像一个汽车工厂，负责将成品的汽车零件组装在一起。

以下内容将告诉你如何使用SVNtrunk：

除非你必须处理一些容易且能迅速解决的BUG，或者你必须添加一些无关逻辑的文件（比如媒体文件：图像，视频，CSS等等），否则永远不要在trunk直接做开发

不要因为特殊的需求而去对先前的版本做太大的改变，如何相关的情况都意味着需要建立一个branch（如下所述）

不要提交一些可能破坏trunk的内容，例如从branch合并

如果你在某些时候偶然间破坏了trunk，bringsomecakethenextday(”withgreatresponsibilitiescome…hugecakes”)

——Branches

SVN组成branches，一个branch就是从一个SVN仓库中的子树所作的一份普通拷贝。通常情况它的工作类似与UNIX系统上的符号链接，但是你一旦在一个SVNbranch里修改了一些文件，并且这些被修改的文件从拷贝过来的源文件独立发展，就不能这么认为了。当一个branch完成了，并且认为它足够稳定的时候，它必须合并回它原来的拷贝的地方，也就是说：如果原来是从trunk中拷贝的，就应该回到trunk去，或者合并回它原来拷贝的父级branch。

以下内容将告诉你如何使用SVNbranches：

如果你需要修改你的应用程序，或者为它开发一个新的特性，请从trunk中创建一个新的branch，然后基于这个新的分支进行开发

除非是因为必须从一个branch中创建一个新的子branch，否则新的branch必须从trunk创建

当你创建了一个新branch，你应当立即切换过去。如果你没有这么做，那你为什么要在最初的地方创建这个分支呢？

——Tags

SVN组成Tags。从表面上看，SVNbranches和SVNtags没有什么差别，但是从概念上来说，它们有许多差别。其实一个SVNtags就是上文所述的“为这棵树照张相”：一个trunk或者一个branch修订版的命名快照。

以下内容将告诉你如何使用SVNtags：

作为一个开发者，永远不要切换至、取出，或者向一个SVNtag提交任何内容：一个tag好比某种“照片”，并不是实实在在的东西，tags只可读，不可写。

在特殊或者需要特别注意的环境中，如：生产环境（production）、？（staging）、测试环境（testing）等等，只能从一个修复过的（fixed）tag中checkout和update，永远不要commit至一个tag。

对于上述提及到的环境，可以创建如下的tags：“production”，“staging”，“testing”等等。你也可以根据软件版本、项目的成熟程度来命名tag：“1.0.3”，“stable”，“latest”等等。

当trunk已经稳定，并且可以对外发布，也要相应地重新创建tags，然后再更新相关的环境（production,staging,etc）

——工作流样例

假设你必须添加了一个特性至一个项目，且这个项目是受版本控制的，你差不多需要完成如下几个步骤：

使用SVNcheckout或者SVNswitch从这个项目的trunk获得一个新的工作拷贝（branch）

使用SVN切换至新的branch

完成新特性的开发（当然，要做足够的测试，包括在开始编码前）

一旦这个特性完成并且稳定（已提交），并经过你的同事们确认，切换至trunk

合并你的分支至你的工作拷贝（trunk），并且解决一系列的冲突

重新检查合并后的代码

如果可能的话，麻烦你的同事对你所编写、更改的代码进行一次复查（review）

提交合并后的工作拷贝至trunk

如果某些部署需要特殊的环境（生成环境等等），请更新相关的tag至你刚刚提交到trunk的修订版本,使用SVNupdate部署至相关环境

简介
1. 我们都知道SVN是管理项目源代码的软件，可以把我们开发中的各个阶段的代码记录下来，供我们以后来使用，那么SVN具体的结构你是否知道呢？下面我们来介绍一下它的基本结构

Trunk、Branches、Tags、作用
1. Trunk
  1. 这是SVN目录的主分支，表示日常开发中的项目，任何时候Trunk里包含的都是最新的开发代码。这里的代码将会工作到你的下一个主要发布版本。
  2. Trunk应该只被用来开发将会成为你的下一个重要版本的代码。
  3. 几乎常常人们只使用trunk来存放他们的代码。发放了一个版本后继续在其上进行下一版开发。这样开发是混论的，如果出现大的Bug往往不好恢复到之前版本，因此，增加了一个Branches文件
1. Branches
  1. 常用的Branches分支有好几种类型，这里列出常用的几种。
  2. Release Branches
    1. 当trunk达到准备发布的阶段时（或者你想冻结新特色的添加时），你应该创建一个release branches。
  1. Bug fix branches
    1. 分支也可以用于处理trunk或release branches里发现的严重的Bug。
  1. Experimental branches
    1. 有时你想将某个新技术引进项目。这很好，但是你当然不想赌上你的整个项目。想象一下，你想把你的Web程序从PHP4改为PHP5。你要花多少时间？在这期间你的trunk停止使用？直到你把所有到PHP5的转换做完
1. Tags
  1. 一般情况下，tag，是用来做一个milestone的，不管是不是release，都是一个可用的版本。这里，应该是只读的。
  2. 在SVN中Tag和Branches，在一个选项里面创建时区别不明显，Tags中存放的也是Trunk的一个副本，只不过是只读的，不可以修改，权限不同。

Trunk、Branches、Tags详细使用
1. Trunk
  1. 文件夹中右键，选“Create repository here”
  1. 选择“Create folder Structure”，然后，浏览建好的文件结构
1. Branches
  1. Create
  1. Merge
    1. Branches To Trunk
      1. 这种方式用的最多,属于常用的一种。
      2. 在Trunk中,选中UI文件夹，右键
      1. 如下图，选择”merge”
      1. 选择“Merge a range of revisions”
      1. 选择要合并的目录，这里选择branches中UI文件夹
      1. 合并完成
    1. Trunk To Branches
    1. Branches To Branches
1. Tags
  1. 标记同branches类似,同上.

意义
1. SVN解决了我们数据备份、版本控制、数据同步等面对的问题，因而深受很多人喜爱和使用，它是一个不错的管理知识的软件工具。
1. 我们自己也可以用SVN管理我们的知识。

branch, Medium, SVN, tags, transfer, Trunk

WordPress database error: [Table 'yf99682.wp_s6mz6tyggq_comments' doesn't exist]
SELECT SQL_CALC_FOUND_ROWS wp_s6mz6tyggq_comments.comment_ID FROM wp_s6mz6tyggq_comments WHERE ( comment_approved = '1' ) AND comment_post_ID = 491 ORDER BY wp_s6mz6tyggq_comments.comment_date_gmt ASC, wp_s6mz6tyggq_comments.comment_ID ASC

Reposted from: https://www.cnblogs.com/keyi/p/5953649.html

Leave a Comment Cancel reply