冰凉咖啡屋

Recipes

取出·Checking out.....................................................Page 63
svn checkout URL path

取出一个特定版本·Checking out a specific revision ....................Page 63
svn checkout -r rev URL

按照特定日期取出·Checking out a specific date.........................Page 63
svn checkout -r "{date}" URL

给出使用的拷贝的来源·Finding out where a working copy came from.......Page 63
svn info path

更新一个使用的拷贝·Updating a working copy .........................Page 64
svn update

更新一个使用的拷贝的特定条款·Updating specific items in a working copy.Page 64
svn update path...

向仓库中添加一个文件·Adding files to the repository..............Page 66
svn add path...

在一件或者目录中设定属性·Setting a property on a file or directory ...Page 67
svn propset propname propvalue path...

编辑文件或目录的属性·Editing a property on a file or directory .......Page 67
svn propedit propname path...

列出一个文件或目录的属性·Listing the properties on a file or directory.Page 67
svn proplist path...

打出一个属性的内容·Printing the contents of a property..............Page 67
svn propget propname path...

删除一条属性·Deleting a property ....................................Page 68
svn propdel propname path...

启用一个文件的关键字扩展·Enabling keyword expansion for a file........Page 69
svn propset svn:keywords "keywords" file...

忽略一个目录中的特定文件·Ignoring certain files in a directory.......Page 71
svn propedit svn:ignore path...

设定文件的行尾风格·Setting end-of-line style for a file .............Page 72
svn propset svn:eol-style style path...

设定文件的mime-type·Setting the mime-type of file..................Page 73
svn propset svn:mime-type mime-type path...

执行一个文件·Marking a file executable...............................Page 74
svn propset svn:executable true path...

复制一个文件或目录·Copying a file or directory......................Page 76
svn copy source destination

重命名一个文件或目录·Renaming a file or directory..................Page 77
svn rename oldname newname

移动一个文件或者目录·Moving a file or directory ......................Page 77
svn move source destination

显示一个文件或目录的修改·Showing changes to a file or directory......Page 80
svn diff path...

比较一个文件的两个修订·Comparing two revisions of a file .............Page 81
svn diff -rrev1:rev2 file

显示一个文件和仓库中最新文件的修改·Showing changes between a file and the
latest revision in the repository......Page 83
svn diff -r HEAD file...

显示一个文件最新的修改·Showing the most recent change to a file.......Page 84
svn diff -r PREV:BASE file...

生成一个patch文件·Creating a patch file...............................Page 85
svn diff > patchfile

接受一个patch文件·Applying a patch file..........................Page 85
patch -p0 -i patchfile

冲突时放弃自己的修改·Discarding your changes in the face of a conflict.Page 88
svn revert file...
svn update file...

冲突时放弃其他人的修改·Discarding someone else’s changes in the face of a
aconflict.............Page 90
cp file.mine file
svn resolved file

产生一个冲突解决方案·Marking a conflict resolved....................Page 90
svn resolved file...

修改的标记·Checking in changes ......................................Page 91
svn commit -m "message"

显示一个文件的历史·Showing history for a file.......................Page 91
svn log file

显示一个目录近来的活动·Showing recent activity in a directory.......Page 93
svn log path | more

显示一个文件的详细历史·Showing detailed history for a file...........Page 93
svn log -v file...

使用作者信息注释一个文件·Annotating files with author information.....Page 94
svn blame file...

回复一个已提交的修改·Reverting an already committed change...........Page 96
svn merge -r rev:rev-1 path...

检查工作中拷贝的状态·Checking the working copy status ..............Page 98
svn status

显示仓库中的升级·Showing updates pending from the repository .......Page 98
svn status --show-updates

使一个文件可锁·Enabling locking on a file ..........................Page 101
svn propset svn:needs-lock true file...
svn commit -m "Enabled locking" file...

锁住一个文件·Obtaining a lock on a file.............................Page 102
svn lock file...-m "lock comment"

查看一个文件的锁信息·Examining lock information for a file .........Page 103
svn info file...| grep Lock

破坏其他用户对文件的锁·Breaking another user’s lock on a file......Page 104
svn unlock --force URL

...锁于一个文件·Stealing another user’s lock on a file ............Page 105
svn lock --force file...-m "lock message"

生成一个发布分支·Creating a release branch .........................Page 116
svn copy \
svn://myserver/project/trunk \
svn://myserver/project/branches/RB-x.y

取出一个发布分支·Checking out a release branch.......................Page 117
cd work
svn checkout \
svn://myserver/project/branches/RB-x.y

切换一个工作拷贝到一个发布分支·Switching a working copy to a release
branch....Page 118
cd myproj
svn switch \
svn://myserver/project/branches/RB-x.y

切换一个工作拷贝到主分支·Switching a working copy back to the trunk...Page 118
cd myproj
svn switch svn://myserver/project/trunk

生成一个发布标签·Creating a release tag...............................Page 119
svn copy \
svn://myserver/project/branches/RB-x.y \
svn://myserver/project/tags/REL-x.y

取出一个发布·Checking out a release...................................Page 120
svn checkout \
svn://myserver/project/tags/REL-x.y

从发布分支合并一个简单的bug fix到主分支·Merging a simple bug fix from a release
 branch to the Trunk............................................Page 122
cd project
svn update
svn merge -rrev-1:rev \
svn://myserver/project/branches/RB-x.y

从一个重大bug fix中生成一个分支·Creating a branch for a complex bug fix...Page
123
svn copy \
svn://myserver/project/branches/RB-x.y \
svn://myserver/project/branches/BUG-track
svn copy \
svn://myserver/project/branches/BUG-track \
svn://myserver/project/tags/PRE-track

取出一个bug fix分支·Checking out a bug fix branch..........................Page
 123
svn checkout \
svn://myserver/project/branches/BUG-track

在bug fix之后进行标签·Tagging the end of a bug fix..................Page 124
svn copy \
svn://myserver/project/branches/BUG-track \
svn://myserver/project/tags/POST-track
RECIPES 212

合并一个重大bug fix到发布分支·Merging a complex bug fix to a release
branch..Page 124
cd RBx.y
svn merge \
svn://myserver/project/tags/PRE-track \
svn://myserver/project/tags/POST-track

生成一个实验性的分支·Creating experimental Branches...................Page 125
svn copy \
svn://.../trunk \
svn://.../branches/TRY-initials-mnemonic

使用一个实验性分支·Using an experimental branch.......................Page 125
svn switch \
svn://.../branches/TRY-initials-mnemonic

返回主分支·Returning to the trunk ....................................Page 125
svn switch svn://.../trunk

找出分支生成的时间·Finding out when a branch was created .............Page 126
svn log --stop-on-copy \
svn://.../branches/branch

合并一个实验性分支·Merging an experimental branch ....................Page 127
svn log --stop-on-copy \
svn://.../branches/TRY-initials-mnemonic
cd trunk-working-copy
svn merge \
-r branch-start-revision:HEAD \
svn://.../branches/TRY-initials-mnemonic
svn commit

向仓库中引入项目·Importing a project into the repository .............Page 130
cd project
svn import svn://myserver/project/trunk

手动为一个项目生成目录·Manually creating directories for a project ...Page 130
svn mkdir svn://myserver/project/
svn mkdir svn://myserver/project/trunk
svn mkdir svn://myserver/project/tags
svn mkdir svn://myserver/project/branches

引入第三方代码·Importing third-party code.............................Page 145
svn import vendor-tree \
svn://.../vendorsrc/vendor/product/current

Tagging a vendor drop .................................................Page 146
svn copy \
svn://.../vendorsrc/vendor/product/current \
svn://.../vendorsrc/vendor/product/version

Loading a new vendor drop..............................................Page 147
svn load dirs.pl \
svn://.../vendorsrc/vendor/product \
current vendor-tree

Using vendor code in a project ........................................Page 148
svn copy \
svn://.../vendorsrc/vendor/product/ver \
svn://.../project/trunk/vendor/product

Upgrading vendor code in a project ....................................Page 149
svn merge \
svn://.../vendorsrc/vendor/product/oldver \
svn://.../vendorsrc/vendor/product/newver \
vendor/product

在Windows中启动svnserve·Starting svnserve on Windows .................Page 153
start svnserve --daemon --root repos-dir

在Unix中启动svnserve·Starting svnserve on Unix........................Page 153
svnserve --daemon --root repos-dir

对仓库进行完全备份·Creating a full backup of your repository .........Page 170
svnadmin dump repos > dumpfile

对仓库进行增量备份·Creating an incremental backup of your repository .Page 171
svnadmin dump --incremental --revision rev1:rev2 repos