# Dictionary:

# BASE revision     基础版本

# blame             追溯

# branch            分支

# checkout          检出

# default           默认

# HEAD revision     最新版本

# overlay           重载　　n. 覆盖图；覆盖物

# remove            删除

# rename            改名

# repository        版本库

# revert            恢复

# revision          版本

# Subversion book   Subversion 手册

# undo              撤销

# unified diff      标准差异

# unversioned       未版本控制

# versioned         已版本控制

# working copy      工作副本

 查看当前工作目录svn 状态

简写：svn st

、将文件checkout到本地目录

svn checkout path（path是服务器上的目录）

简写：svn co
svn co svn://172.16.1.14/7a --username fgy1 --password 123456

、往版本库中添加新的文件,如果不添加，就不能提交(commit)

svn add file
svn commit aa.txt -m "eifej"
svn: Commit failed (details follow):
svn: '/root/svn/7a/aa.txt' is not under version control

11:14:44 16 ~/svn/7a:#svn add aa.txt
A         aa.txt
11:15:07 17 ~/svn/7a:#svn commit aa.txt -m "eifej"
Adding         aa.txt
Transmitting file data .
Committed revision 10.

、将改动的文件提交到版本库

svn commit -m “LogMessage” [-N] [--no-unlock] PATH(如果选择了保持锁，就使用–no-unlock开关)

简写：svn ci

、加锁/解锁

svn lock -m “LockMessage” [--force] PATH

svn unlock PATH

、更新到某个版本

svn update -r m path

简写：svn up

、查看文件或者目录状态

）svn status path（目录下的文件和子目录的状态，正常状态不显示）

）svn status -v path(显示文件和子目录状态)

简写：svn st

、删除文件

svn delete path -m “delete test fle”

简写：svn (del, remove, rm)

、查看日志

svn log path

、查看文件详细信息

svn info path

、比较差异

svn diff path(将修改的文件与基础版本比较)

svn diff -r m:n path(对版本m和版本n比较差异)

简写：svn di

、将两个版本之间的差异合并到当前文件

svn merge -r m:n path

、SVN 帮助

svn help

svn help ci

[root@c64 build-finished]# svn st

svn: warning: '.' is not a working copy

[root@c64 build-finished]# mkdir web

[root@c64 build-finished]# svn co svn://172.16.1.9/flt8a-2-server/webserver/trunk /root/newbuild/build-finished/web

[root@c64 web]# svn help

usage: svn <subcommand> [options] [args]

Subversion command-line client, version 1.6..

Type 'svn help <subcommand>' for help on a specific subcommand.

Type 'svn --version' to see the program version and RA modules

  or 'svn --version --quiet' to see just the version number.

Most subcommands take file and/or directory arguments, recursing

on the directories.  If no arguments are supplied to such a

command, it recurses on the current directory (inclusive) by default.

[root@c64 web]# svn info

Path: .

URL: svn://172.16.1.9/flt8a-2-server/webserver/trunk

Repository Root: svn://172.16.1.9/flt8a-2-server

Repository UUID: e452d122-dd6b--94b0-2d396b7a452b

Revision:

Node Kind: directory

Schedule: normal

[root@c64 web]# svn ls

.htaccess

application/

attach

cache/

data/

favicon.ico

getRoute.php

index.php

load_data.sh

shellext/

sqlnet.log

system/

tcp.php

upfile/

welcome.html

[root@c64 web]# svn log -v|more

------------------------------------------------------------------------

r2670 | deravo | -- :: + (Wed,  May ) |  line

Changed paths:

   M /webserver/trunk/application/models/api/mod_rep_org.php

------------------------------------------------------------------------

r2669 | deravo | -- :: + (Tue,  May ) |  line

Changed paths:

   M /webserver/trunk/application/controllers/api/Relation/CarAndDriver/Get.php

------------------------------------------------------------------------

r2668 | deravo | -- :: + (Tue,  May ) |  line

Changed paths:

   M /webserver/trunk/application/controllers/api/BasicInfo/Vehicle/Del.php

[root@c64 web]# svn log -v -r

------------------------------------------------------------------------

r2386 | deravo | -- :: + (Thu,  Jan ) |  line

Changed paths:

   M /webserver/trunk/application/controllers/api/Alarm/Action/act_Deal_Realtime_Result.php

   M /webserver/trunk/application/models/api/mod_alarm.php

------------------------------------------------------------------------

[root@c64 web]# svn up

At revision .

[root@c64 web]# svn up

A    新建文本文档.txt

Updated to revision .

[root@c64 web]# svn st --show-updates

Status against revision:   

[root@c64 api]# pwd

/root/newbuild/build-finished/web/application/models/api

[root@c64 api]# svn di -r : mod_org.php

Index: mod_org.php

===================================================================

--- mod_org.php (revision )

+++ mod_org.php (revision )

@@ -, +, @@

                        NULL TRANSPORT_NUM,

                        NVL(VEHICLE_COUNT, ) VEHICLE_COUNT,

                        NVL(ONLINE_COUNT, ) ONLINE_COUNT,

-                       PLATE_SHOW_TYPE")->from("

+                       PLATE_SHOW_TYPE,

+                       MONITOR_TYPE")->from("

                        (SELECT * FROM ORG_INFO WHERE ORG_ID =  ) OI

                        LEFT JOIN

                        (

The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and TortoiseSVN client know how to make use of this library.

The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Subversion 1.5 and later, both the svnserve server and svn client know how to make use of this library. 

源码包　　if you're building Subversion yourself
二进制包　　If you're using a prebuilt Subversion binary package

It may or may not be available to you: if you're building Subversion yourself, you'll need to have at least version 2.1 of SASL installed on your system, and you'll need to make sure that it's

detected during Subversion's build process. If you're using a prebuilt Subversion binary package, you'll have to check with the package maintainer as to whether SASL support was compiled in. 
SASL comes with a number of pluggable modules that represent different authentication systems: Kerberos (GSSAPI), NTLM, OneTime-Passwords (OTP), DIGEST-MD5, LDAP, Secure-Remote-Password (SRP), and others. 
Certain mechanisms may or may not be available to you; be sure to check which modules are provided.

For many teams, the built-in CRAM-MD5 authentication is all they need from svnserve. However, if your server (and your Subversion clients) were built with the Cyrus Simple Authentication and Security Layer (SASL) library, you have a number of authentication and encryption options available to you.

inherently    adv. 内在地；固有地；天性地

Normally, when a subversion client connects to svnserve, the server sends a greeting that advertises a list of the capabilities it supports, and the client responds with a similar list of capabilities. 
If the server is configured to require authentication, it then sends a challenge that lists the authentication mechanisms available; the client responds by choosing one of the mechanisms, and then authentication is carried out in some number of round-trip messages. 
Even when SASL capabilities aren't present, the client and server inherently know how to use the CRAM-MD5 and ANONYMOUS mechanisms (see the section called “Built-in Authentication and Authorization”). 
If server and client were linked against SASL, a number of other authentication mechanisms may also be available. However, you'll need to explicitly configure SASL on the server side to advertise them.

SASL is also able to perform data encryption if a particular mechanism supports it. 
The built-in CRAM-MD5 mechanism doesn't support encryption, but DIGEST-MD5 does, and mechanisms such as SRP actually require use of the OpenSSL library. 

1.先看是否支持sasl

[Thu Nov 19 09:35:19 1029 /dev/pts/0 192.168.2.250 /svnroot/personal/conf]#svnserve --version

svnserve, version 1.6.11 (r934486)

   compiled Aug 17 2015, 08:37:43

Copyright (C) 2000-2009 CollabNet.

Subversion is open source software, see http://subversion.tigris.org/

This product includes software developed by CollabNet (http://www.Collab.Net/).

The following repository back-end (FS) modules are available:

* fs_base : Module for working with a Berkeley DB repository.

* fs_fs : Module for working with a plain file (FSFS) repository.

Cyrus SASL authentication is available.

2.创建版本库

svnadmin create /svnroot/personal

3.安装支持库

[Thu Nov 19 09:35:25 1030 /dev/pts/0 192.168.2.250 /svnroot/personal/conf]#yum install cyrus-sasl-md5

4.修改为下面的

[Thu Nov 19 09:35:25 1030 /dev/pts/0 192.168.2.250 /svnroot/personal/conf]#grep -v "^#" svnserve.conf

[general]

anon-access = none

auth-access = write

authz-db = authz

realm = tele125server

[sasl]

use-sasl = true

min-encryption = 128

max-encryption = 256

5.sasl文件操作

mv /etc/sasl2/smtpd.conf /etc/sasl2/svn.conf

vi /etc/sasl2/svn.conf

pwcheck_method: auxprop

auxprop_plugin: sasldb

sasldb_path: /svnroot/personal/conf/sasldb

mech_list: DIGEST-MD5
只写一个DIGEST-MD5,意味着严格限制客户端，如果不严格限制，可以加
ANONYMOUS,CRAM-MD5,DIGEST-MD5
However, if you still want non-SASL clients to be able to authenticate, be sure to advertise the CRAM-MD5 mechanism as an option. All clients are able to use CRAM-MD5, whether they have SASL capabilities or not.

6.用户操作

添加用户

-u realm,这个realm与svnserve.conf中的realm要一致

saslpasswd2 -c -f /svnroot/personal/conf/sasldb -u tele125server fgy

查询用户

sasldblistusers2 -f /svnroot/personal/conf/sasldb

7.启动服务

svnserve -d -r /svnroot/

过程中遇到的问题

1.用linux下的svn客户端报下面错误

svn: Cannot negotiate authentication mechanism

2.用win下的torisesvn客户端报下面错误

SASL authentication error: SASL(-1): generic failure: Unable to find a callback: 2

3.用win下的torisesvn客户端报下面错误

URL 'svn://125.76.228.16:873/personal' doesn't exist

问题解答

1与2其实要注意下面的书写，(还有客户端与服务端都要安装 yum install cyrus-sasl-md5这个包)

mech_list: DIGEST-MD5

还有要做这个操作，默认是smtpd.conf。

mv /etc/sasl2/smtpd.conf /etc/sasl2/svn.conf

3的问题是服务启动时，要用下面，

svnserve -d -r /svnroot

而不是

svnserve -d -r /svnroot/personal

14:53:03 99 ~/.subversion/auth/svn.simple:#cat 5863bb9415deff2b0aefee67ce902430

K 8

passtype

V 6

simple

K 8

password

V 6

123456

K 15

svn:realmstring

V 39

<svn://125.76.238.16:873> tele125server

K 8

username

V 3

f3y

END

本地出现这种提示的话，

选择no就是加密是下面这个文件里的内容

选择yes就是不加密是上面这个文件里的内容，密码明文保存

-----------------------------------------------------------------------

ATTENTION!  Your password for authentication realm:

   <svn://125.76.228.16:873> tele125server

can only be stored to disk unencrypted!  You are advised to configure

your system so that Subversion can store passwords encrypted, if

possible.  See the documentation for details.

You can avoid future appearances of this warning by setting the value

of the 'store-plaintext-passwords' option to either 'yes' or 'no' in

'/root/.subversion/servers'.

-----------------------------------------------------------------------

Store password unencrypted (yes/no)? no

14:46:36 88 ~/.subversion/auth/svn.simple:#cat 5863bb9415deff2b0aefee67ce902430

K 15

svn:realmstring

V 39

<svn://125.76.238.16:873> tele125server

K 8

username

V 3

f3y

END

将win下的库目录直接复制到linux下

svnserve -d -r /root/Repositories --log-file /root/svn.log

密码权限问题：

windows下visualSVN使用apache的htpasswd，htpasswd密码采用md5加密

Linux下svn的passwd文件的密码是明文形式保存的。所以原来的MD5密码将不可使用。

版本问题：乌龟去连接时报下面的错误

Unable to connect to a repository at URL 'svn://192.168.1.153/test'

Expected FS format between '1' and '4'; found format '6'

将conf下的format与conf/db/下的format改一下

yum install subversion httpd mod_ssl mod_dav_svn

[root@svn-199 svn]# cat /etc/httpd/conf.modules.d/00-ssl.conf

LoadModule ssl_module modules/mod_ssl.so

[root@svn-199 svn]# cat /etc/httpd/conf.modules.d/10-subversion.conf

LoadModule dav_svn_module     modules/mod_dav_svn.so

LoadModule authz_svn_module   modules/mod_authz_svn.so

LoadModule dontdothat_module  modules/mod_dontdothat.so

分两种情况，空库，有数据的库

一。空库

svn部分

mkdir /home/svnroot

svnadmin create /home/svnroot/test

htpasswd -c /home/svnroot/test/conf/passwd lichao

将已有文件导入新库中

mkdir /home/aa

cp /root/svn.log /root/xe-guest-utilities-* /home/aa/

svn import /home/aa/ file:///home/svnroot/test/ -m "init"

[root@svn-199 svn]# cat /etc/sysconfig/svnserve

# OPTIONS is used to pass command-line arguments to svnserve.

#

# Specify the repository location in -r parameter:

#OPTIONS="-r /var/svn"

#OPTIONS="-d -r /root/Repositories --log-file /root/svn.log"

#OPTIONS="-d -r /home/svn/Repositories --log-file /root/svn.log"

OPTIONS="-d -r /home/svnroot --log-file /root/svn.log"

[root@svn-199 svn]# cat /home/svnroot/test/conf/authz

[/]

lichao = rw

https部分（ssl部分）

cd /etc/pki/tls/private

openssl genrsa -out my.key 1024

openssl req -new -key my.key -out my.csr

cd /etc/pki/tls/certs

openssl x509 -req -days 365 -in /etc/pki/tls/private/my.csr -signkey /etc/pki/tls/private/my.key -out my.crt  

修改为下面/etc/httpd/conf.d/ssl.conf文件

SSLCertificateFile /etc/pki/tls/certs/my.crt

SSLCertificateKeyFile /etc/pki/tls/private/my.key

修改为下面/etc/httpd/conf/httpd.conf

<Directory />

    AllowOverride none

    Require all denied

主要是添加下面行，也可以将下面行加入到subversion.conf中，以达到只影响svn目录的效果。

    SSLRequireSSL

</Directory>

http目录部分

[root@svn-199 svn]# cat /etc/httpd/conf.d/subversion.conf

<Location /svn>

     DAV svn

     SVNListParentPath on

     SVNParentPath /home/svnroot

     AuthType Basic

     AuthName "Authorization"

     AuthUserFile /home/svnroot/test/conf/passwd

     AuthzSVNAccessFile /home/svnroot/test/conf/authz

     Require valid-user
　　  SSLRequireSSL

</Location>

SVNParentPath路径必须为svnadmin create生成数据仓库路径的父目录，如上面建立数据仓库的命令为svnadmin create /storage/svn/aiezu，则SVNParentPath为/storage/svn。

启动服务并查看报错

systemctl start svnserve httpd

两个日志可以查看报错

/var/log/httpd/error.log

/root/svn.log

测试部分

浏览器访问https://ip/svn,看ssl,认证，及目录是否能看到。

二。有数据的库

将windows平台的visualSVN库打包压缩，然后传到linux上，再解包

unzip Repositories.zip

[root@svn-199 svn]# cat /etc/httpd/conf.d/subversion.conf

<Location /svn>

     DAV svn

     SVNListParentPath on

     SVNParentPath /home/svn/Repositories

     AuthType Basic

     AuthName "Authorization"

     AuthUserFile /home/svn/Repositories/SinoPes-xa/conf/passwd

     AuthzSVNAccessFile /home/svn/Repositories/SinoPes-xa/conf/authz

     Require valid-user

</Location>