The SVN client tool cornerstone Use tutorial under Mac

The previous articles I introduced SVN server installation, configuration, actual combat. Of course, there are some client-side test commands, which is a very good choice, but for us humans still like the operation of the graphical interface. So this article will cover the use of one of my favorite SVN client tools.

Want to install the cornerstone friend, I have the bad news is that if you want to use its genuine software, you need to spend dozens of of dollars, of course, here I bring you a good information is always valuable, that is in our celestial use of software is really the best, I'll give you a better version of the hack I found online:Http://pan.baidu.com/s/1o6F31zG

This cracked version of the Cornerstone Software installation method I do not introduce, because it is too easy. This article focuses on how it is used.

When you open the software you will see the interface as shown:

Now it's empty, so we should do something to make it work. The interface is also very intuitive and guided, I directly press the gray area of the "ADD repository"

When the click is complete, the configuration screen will pop up and we will typically use the Fourth tab "SVN Server".

The SVN server configuration I have accessed for SVN servers is described in the following configuration:

Tunnel: Access channel, no modification by default

Server: My svn server is local, so server fills in localhost

PORT: Set the port number, I do not configure the access port number on the server, so port is left blank

Repository path: This is the directory location for the server repository, and I'm filling in company here because I added the company repository under the root path of the SVN service.

Nickname: Display name. This can be casually filled out, recommended for the warehouse and the combination of user names.

If your configuration is correct should be added successfully, if the error, please check if the server is turned on and you are configured correctly etc. After we added the warehouse successfully:

  

You can see the directory structure in the SVN server configuration combat that I wrote yesterday.

Now let's try Corenerstone to replace our command line. Describes the role of each function module:

Iv. Introduction of Use

1. Uploading Items to Repository

You can drag directly into the subfolder of repository, or select the Import button above the software to upload, will pop up the option to fill in the location and name, and then select Import to

2. Download the project

There are two types of downloads: Export and check out, except that the export project will not be associated with the source file in Repository, is a standalone version, and the check out file will create a working copy, see the first image of step three , this file is associated with the source file in the library, when there is a new version (others modified) or local modification (self-modification), working copy will show the number of changes, the number of white is modified by others, the number of gray for me to modify the quantity

So if you are a developer in the project, you can choose check out, if you just download the view, do not want your own changes affect the whole project, it is best to choose Export

3. Version Management

Each commit creates a new version, and all historical versions are saved in Repository, such as (can be retrieved by a modified person and submitted information), so using SVN development gives you a good control over the problem of code repair when an unresolved and unknown bug occurs in the project:

SVN facilitates multiple people to develop code merging issues for the same project, but there are a few things to note:

① first update after submission

When you see a new version (that is, the companion has already submitted the code), update the code until working copy no longer shows the white circle, and then run the code to determine that it can be run and function correctly before committing its own code, which can cause multiple conflicts or bugs in the project, and it is difficult to troubleshoot the cause

② complete the standalone function before submitting, and be sure to fill in the submission information

Each completion of a separate function, or solve a bug and then submit the code, do not repeat the submission repeatedly, resulting in too many versions, and must fill in the submission of information, the completion of this completed what function, convenient can be a message search to view the historical version

③ Conflict File

In principle, the same group of developers are best not to operate in the same file, but sometimes must go to other files to operate, or a mistake, if at the same time multiple people in the same file to modify the code, the author will appear after the version of the conflict file, there will generally be three different suffixes of the same name file

. mine file: Changes I have made

Two. r0xx files: xx is a number, the number is smaller for the change before the file, the larger for the changed file, in the file will have <<<< mine. r0xx >>>>> and so on the words contained in the code, that is, the place of the conflict, In this case, please discuss with colleagues in the group or delete some of your own files to debug, repair the file

For iOS projects: If a project or file does not open, select Show Package Contents---Open project.pbxproj file, search. Mine, place the. Mine part before and after << << >>>> included in the code deletion, the project can be opened, if a build when a Xib file cannot open the error, then select, open with the document, the same as above to solve the problem can not build

④ new Add File

Submit a newly added file displayed as a question mark status, select the right click after select Add to working copy and then commit

The SVN client tool cornerstone Use tutorial under Mac