SVN魔法笔记：工作中不可或缺的命令宝典

yum install -y subversion

svn --version

mkdir -p /var/svn/repository

mkdir helloworld

svnadmin create /var/svn/repository/helloworld

vim /etc/sysconfig/svnserve

systemctl list-unit-files | grep svn

systemctl enable svnserve.service

systemctl start svnserve.service

[aliases]
# joe = /C=XZ/ST=Dessert/L=Snake City/O=Snake Oil, Ltd./OU=Research Institute/CN=Joe Average
# 用户组
[groups]
chengdu = user1,user2
beijing = user3
# 针对版本库根目录设置权限
[/]
@beijing = rw
# 设置指定版本库权限
[/helloworld]
@chengdu = rw
user5 = r
# * = 表示除了上述配置权限的用户之外，其他用户没有任何权限
* = 

### This file is an example password file for svnserve.
### Its format is similar to that of svnserve.conf. As shown in the
### example below it contains one section labelled [users].
### The name and password for each user follow, one account per line.
[users]
user1 = passwd01
user2 = 123456
user3 = abcdefg
user4 = aaaa
user5 = bbbb

### Visit http://subversion.apache.org/ for more information.
[general]
### The anon-access and auth-access options control access to the
### repository for unauthenticated (a.k.a. anonymous) users and
### authenticated users, respectively.
### Valid values are "write", "read", and "none".
### Setting the value to "none" prohibits both reading and writing;
### "read" allows read-only access, and "write" allows complete 
### read/write access to the repository.
### The sample settings below are the defaults and specify that anonymous
### users have read-only access to the repository, while authenticated
### users have read and write access to the repository.
anon-access = none
# 开启授权访问
auth-access = write
### The password-db option controls the location of the password
### database file.  Unless you specify a path starting with a /,
### the file's location is relative to the directory containing
### this configuration file.
### If SASL is enabled (see below), this file will NOT be used.
### Uncomment the line below to use the default password file.
password-db = passwd
### The authz-db option controls the location of the authorization
### rules for path-based access control.  Unless you specify a path
### starting with a /, the file's location is relative to the the
### directory containing this file.  If you don't specify an
### authz-db, no path-based access control is done.
### Uncomment the line below to use the default authorization file.
authz-db = authz
### This option specifies the authentication realm of the repository.
### If two repositories have the same authentication realm, they should
### have the same password database, and vice versa.  The default realm
### is repository's uuid.
# realm = My First Repository
### The force-username-case option causes svnserve to case-normalize
### usernames before comparing them against the authorization rules in the
### authz-db file configured above.  Valid values are "upper" (to upper-
### case the usernames), "lower" (to lowercase the usernames), and
### "none" (to compare usernames as-is without case conversion, which
### is the default behavior).
# force-username-case = none
[sasl]
### This option specifies whether you want to use the Cyrus SASL
### library for authentication. Default is false.
### This section will be ignored if svnserve is not built with Cyrus
### SASL support; to check, run 'svnserve --version' and look for a line
### reading 'Cyrus SASL authentication is available.'
# use-sasl = true
### These options specify the desired strength of the security layer
### that you want SASL to provide. 0 means no encryption, 1 means
### integrity-checking only, values larger than 1 are correlated
### to the effective key length for encryption (e.g. 128 means 128-bit
### encryption). The values below are the defaults.
# min-encryption = 0
# max-encryption = 256

svn co svn://47.106.183.193/helloworld ./
# svn在检出的时候可以指定用户名和密码
svn co svn://47.106.183.193/helloworld --username xxx --password yyy ./

svn add hello.txt

svn ci -m "第一次提交" hello.txt

svn log
svn log -r 开始版本号:结束版本号

svn list svn://47.106.183.193/helloworld

svn up

svn revert 文件名
svn revert -R 目录名

svn merge -r 最新版本号:目标版本号 目录名或文件名

# 跳过此冲突，稍后解决[推迟]  
  (p)  - skip this conflict and leave it unresolved  [postpone]  
  # 接受整个文件的传入版本[使用版本库里的文件]  
  (tf) - accept incoming version of entire file  [theirs-full]  
  # 拒绝此文件的所有传入更改[使用我自己的文件] 
  (mf) - reject all incoming changes for this file  [mine-full] 
  # 只接受冲突的传入更改  
  (tc) - accept incoming changes only where they conflict  [theirs-conflict]  
  # 拒绝冲突的传入更改并接受其余更改  
  (mc) - reject incoming changes which conflict and accept the rest  [mine-conflict]  
  # 接受工作副本中显示的文件  
  (r)  - accept the file as it appears in the working copy  [working] 
  # 推迟所有剩余冲突  
  (q)  - postpone all remaining conflicts  
  # 在编辑器中更改合并文件  
  (e)  - change merged file in an editor  [edit]  
  # 显示对合并文件所做的所有更改  
  (df) - show all changes made to merged file  
  # 显示所有冲突（忽略合并版本）  
  (dc) - show all conflicts (ignoring merged version)  
  # 使用合并工具解决冲突  
  (m)  - use merge tool to resolve conflict  
  # 启动外部合并工具以解决冲突[启动]  
  (l)  - launch external merge tool to resolve conflict  [launch]  
  # 使用内置的合并工具解决冲突  
  (i)  - use built-in merge tool to resolve conflict