Shulou(Shulou.com)06/03 Report--

Version library

Subversion is a file service system, a special file system. It can record every change, including changes to files and directories, additions and deletions, etc.

Version model lock-modify-unlock

Figure 1 Lock-modify-unlock scheme

Copy-modify-merge

Figure 2 copy-modify-merge scheme

Working copy

A working copy of subversion is a common directory on the local machine that holds some files and can be edited at will. The working copy is in a private workspace, and subversion will not merge your changes with others or show them to others until a specific action has been explicitly done.

Revised version

Fig. 3 subversion version library

The revision number of Subversion is for the entire directory tree, not for a single file. Each revision number represents the specific state of the entire directory tree of the version library after one submission, and another understanding is that the revision number N represents that the version library has been submitted N times. All files in the warehouse are in the same revision at the same time.

Cvs is for each file. The files in the warehouse may be in different revisions at the same time. As shown in figure 4, the number after the file name represents the revised version of the file.

Figure 4 schematic of cvs version library

Branches and label branches

Figure 5 Development Branch

Purpose: maintain different versions according to different small requirements; when collaborative development, individual personnel can develop on the branch and merge into the backbone at an appropriate time.

The branches of Subversion exist in the real normal file system, not in other dimensions, these directories just retain additional historical information. As shown in the following directory structure, all three branches have corresponding directories, but their historical information is different. As shown in figure 5, branch 1 may be copied from the revised version n, branch 2 may be copied from the revised version m, and branch 3 may be copied from the revised version k (m < n < k).

C:\ USERS\ SIY\ PROJ

├─ branch

│├─ branch2

│├─ branch3

│└─ branch4

├─ tags

└─ trunk

Label

Purpose: save the released version.

Subversion tags, like branches, exist in the real file system. After the developer time software function, when releasing to the user, you should make a copy of the released source code, documentation, and binaries as a backup, which can often be called a tag. These tags no longer make any changes and are kept in the warehouse.

C:\ USERS\ SIY\ PROJ

├─ branch

│├─ branch2

│├─ branch3

│└─ branch4

├─ tags

│├─ proj_1.0.0.1

│├─ proj_1.0.0.2

│└─ proj_2.0.0.0

└─ trunk

In essence, there is no essential difference between branches and tags, but they are artificially divided by developers, and they are all copies of the trunk.

To generate branches or tags, simply use the svncopy command to copy the corresponding directory, which can be found in svnhelp copy for help.

Use the graphical interface vs command line

1. Check which directories and files in the working copy have been modified?

D:\ work\ workspace > svnst

? Trunk\ Release

? Trunk\ Debug

? Trunk\ controlled.opt

? Trunk\ controlled.ncb

? Trunk\ test\ Release

? Trunk\ test\ test.plg

? Trunk\ Controller\ Controller_i.c

? Trunk\ Controller\ Release

? Trunk\ Controller\ Controller_i.h

? Trunk\ Controller\ Debug

? Trunk\ Controller\ res\ Thumbs.db

M trunk\ Controller\ ForwardMgrSplit.cpp

! Trunk\ test_lib\ test_lib.ncb

.

Obviously, the graphical interface is intuitive and convenient.

2. Compare the difference between the latest status and the original status of the working copy.

The graphical interface can not compare the entire directory, and the operation is very tedious; if you look at each file is different, and each file is submitted, in the case of a large number of files, there will be too many revisions.

The command line can compare the entire directory, making it easy to see each difference, understand the overall changes, and submit the entire folder.

3. Submit the modification file.

Graphical interface submission: you can submit the entire folder, but you can't view all the changes at the same time, so it's inconvenient to write the change log; each file submission produces too many revisions.

Command line submission: the entire folder can be submitted, all changes can be viewed at the same time, it is convenient to write the modification log.

4. Backup and restore operations.

This feature is not found in the graphical interface of tortoise svn.

Command line backup svnadmin dump warehouse path > proj1.dump (you can back up the specified revision, see the help of the command)

Command line restore:

Svnadmin create warehouse path

Svnadmin load warehouse path

< proj1.dump 图形界面和命令行可结合使用，以命令行为主，图形界面主要用于查看哪些目录哪些文件被修改。 工作流程 1、单人工作过程 l创建仓库 svnadmin create 仓库路径 如：svnadmin create e:\mycode\proj1 若仓库已经存在则跳过 l导入 svn import 本地路径仓库路径 svn import e: \proj1svn:///e:/mycode/proj1 (内网搭建的是https的访问方式) 若已经导入则跳过。导入之后可将proj1删除，真正要编辑的文件要从仓库中导出。 l导出 svn checkout 仓库路径本地路径 如：svn checkout svn:///e:/mycode/proj1 e:\work\proj1 checkout可简写成co，若已经有本地副本则跳过 l更新 svn update 如：进入e:\work\proj1，svn update l修改 进行正常的编程，对于文件的删除添加等操作应该使用svn del，svn add等操作，不能直接使用资源管理器进行操作，否则svn服务器无法知晓。 l提交 svn commit -m "日志" 或者 svn commit (需要配置编辑器)，见注册表文件按editor.reg，此处配置的gvim。 2、多人协作过程 l创建仓库 l导入 l导出 l更新 l修改 l提交 l处理冲突 l再提交 基本和单人的工作过程一致，多了冲突处理。 3、备份还原 这个在代码迁移中很常用（比如两个物理隔离网络之间的代码迁移）。 svnadmin dump 仓库路径 >

Proj1.dump (you can back up the specified revision, depending on the help of the command)

Command line restore:

Svnadmin create warehouse path

Svnadmin load warehouse path < proj1.dump

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.