Svn - detailed documentation

1、 Start by opening Cornerstone

2、 Then as shown in the figure below

3、 Select the corresponding warehouse , As shown in the figure below

 

4、 then Import When it's done , Just submit the local documents to SVN On the server , As shown in the figure below , Plus, if you want to use SVN Version control , Then you need to put the files on the server Check Out To local , In this case, local Check Out The next file is associated with the corresponding file on the server , In this way, when the local file is changed again, it can act on SVN On the server , A purpose of version control has been achieved . Here's the picture ：

PS: If you upgrade when you open the project SVN Version! , Don't upgrade , If you upgrade your Working Copy It may not open .

5、 find Check Out To the local working copy folder , At this time, there will be one more under the folder .svn Hidden files , This file records the additions in the current directory 、 Delete 、 Change operation , As shown in the figure below ：

PS: Input... At the terminal ：defaults write com.apple.finder AppleShowAllFiles -bool true And then restart Finder（ You can input killall Finder）

6、 If in Working Copy If changes are made in the project , Here's the picture ：

It's very important ：

If you want to apply this change to the server , Then you need to select the whole Working Copy（ When you are not sure which file you are changing ） Submit , Just beginning to use SVN When , You must back up the code locally before submitting it to the server every time （ When you are proficient, you don't need to back up ）！！！！ In order to prevent SVN error , Cause code loss . You must first Update Server code to local , And then in Commit Your own changes ！！！

 

Then the following interface appears ：

At this time, other members of the group select the whole Working Copy Conduct Update, Then the line of code you just added will also appear in his project .

7、 If a new file is added , Then, as shown in the figure ：

  

8、 Deletion of files

 

9、 add to ⼀ One ⽂ file , But no choice working copy The direct election is successful ⼯ engineering ⽂ file , So at this time, other team members are Update Then I found that there was red ⾊ Chromatic ⽂ file , reason (1、 Yes, only the configuration is submitted ⽂ file , Did not submit the actual ⽂ Pieces of ,2、 Only the configuration has been updated ⽂ file ) 

 

2

 

10、 The emergence of conflict ： The conflict must be caused by changing the same line or the same piece of code

Here's the picture ： At the same time changed AppDelegate Inside 22 Line code

Communication is needed at this time , Whose code is correct , Whose code to keep , Or keep both codes .

11、 If SVN When using files / After the folder ”?” The situation of , Here's the picture ：

12、 File conflict ：

A Students create a new AViewController, then Update,Commit Submit , then B Students create a new BViewController, then Update, At this time, you will find that the project cannot be opened , The following prompt appears ：

This indicates that the configuration file conflicts , Right click the project file , Select Show package content , Here's the picture ：

Then see the following figure ：

Double click to open the configuration file （project.pbxproj）, Then as shown in the picture ：

And then in Cornerstone Do the following operations in ：

 

13、 When deleting a file, you just delete the reference of the file , And then from Finder Delete the corresponding file in the following figure ：

At this time, you can undo the previous deletion in the following way ：

 

If you want to really delete relevant files , So in Cornerstone Inside :