Mac SVN use

Installation Reference 1 Reference 2

Mac comes with server and client, configuration is ready to use

Create an SVN storage location

Svnadmin create/users/svn/repository (You can create a folder with sudo first)

Configure SVN user Rights There are 3 files in the/users/svn/repository/conf/directory: Authz, passwd, svnserve.conf

Modify Authz:

harry_and_sally = harry,sally

# [/foo/bar]

[/]

Harry = RW

# &joe = R

* =

Modify passwd:

Harry = 123456

Sally = 123456

Modify Svnserve.conf:

Anon-access = Read

auth-access = Write

Password-db = passwd

Authz-db = Authz

Start the server

Svnserve-d-r/users/svn/repository

Without any hint, the boot was successful.

Move out Project

svn checkout svn://127.0.0.1/svn/repository/demo--username=harry --password=123456

SVN help

SVN commit-h or svn help CI

svn常用命令

1, checkout
SVN checkout SVN address, abbreviated: SVN Co SVN address

2. Add Files
SVN add test.txt Add a single file
SVN Add * * Add all Files
SVN add *.php adds all files with the suffix PHP

3. Submit Documents
SVN ci-m "description (can be left blank)" File name submit a single file
SVN ci-m "description (can be left blank)" Submit all Files

4. Delete Files
SVN Delete file name
Shorthand: SVN (del, remove, RM)

5. Locking/unlock
SVN lock-m "Lockmessage" [--force] PATH
SVN unlock-m "Lockmessage" [--force] PATH

6, SVN Update, abbreviated SVN up
SVN update updates all files
SVN update-r test.php (Restore the file test.php in the repository to version 200)
SVN update test.php (update single file, sync in Repository.) If the prompt expires at the time of submission, it is because of the conflict, you need to update, modify the file, then clear the SVN resolved, and then commit the commit)

7. View File Details
SVN info file name

8. View Logs
SVN log file name

9. The meaning of the SVN status [path] character is as follows:
Shorthand: SVN St
"No modifications." No changes
' A ' Added. New additions to the project
' C ' conflicted. The content of the project conflicts with the data that is being updated
' D ' Deleted. The item to delete
' I ' ignored. is ignored
' M ' Modified. The content has changed
' R ' replaced. In the SVN repository is a directory that is locally a file with the same name. Vice versa.
' X ' project not versioned, related to external connection
'? ' files that are not versioned
'! ' item is missing, or the directory is incomplete
' ~ ' has a project that is not versioned locally and has a project with the same name in the SVN repository

10. Compare Differences
SVN diff path
Example: SVN diff test.php
SVN diff-r m:n Path (difference between version m and version N)
Example: SVN diff-r 200:201 test.php
Shorthand: SVN di

11. Merge the differences between the two versions into the current file
SVN merge-r m:n Path
For example: SVN merge-r 200:205 test.php (the difference between version 200 and 205 is merged into the current file, but generally conflicts occur and need to be addressed)

Mac SVN use