Synology System-----------SVN entry notes

Installation instructions using the Description check Out Project Import Project submit update view Log version rollback versioning summary

Installation Instructions

Developers strongly recommend using the SVN plugin in the IDE to be more intelligent and user-friendly.

To install the SVN client first, Windows generally chooses the Turtle client https://tortoisesvn.net/downloads.html.
Select the appropriate client to install according to the number of system bits.

If you prefer to use the command line, please be sure to check the commands on the "Driver" command line to install on the local hard and do not skip this step.

Then you can install it all the way next. When the installation is complete, right-click anywhere to view the shortcut menu. Discovering TORTOISESVN means that the installation was successful.

If you check the Install Command line tool, then enter the command SVN, the following prompt also indicates that the installation was successful

But this time the menu is all in English, if you are not accustomed to English, you can download the language pack, remember the number of system bits.

After the language pack is installed, you can right-click into the setting settings.

Choose the language you like (such as Chinese), and then make sure, no surprises, now the language has switched to Chinese.

This concludes the installation tutorial, which begins with the introduction of SVN usage. Instructions for use Check out Project

If the project is already in the server's repository, all you have to do now is check it out locally.
Create an empty folder first. Right-click inside the empty folder and select svn check out.

Now you see that it should be this interface, fill in the repository address, select OK.

A dialog box will pop up to let you enter your account password and enter your account password. Remember to check save authentication, or you can enter it every time.

Wait a few minutes for the checkout to complete.

Now that you can see your project in your directory, it's time to start a happy job.

Import Project

But sometimes you've built your project locally, and you need to push your project to SVN, so what do you do now?
Right-click to select the Repository browser.

In the corresponding directory, right-click, add files/Add folder, select the appropriate directory.

。

For example, I now have a project called Svnproject, I want to upload it to SVN.

Then I just choose to join the folder.

Be sure to enter the submission information. So that others will know what you have done.

The catalog will be visible if the import succeeds.

However, do not assume that the import is successful. You also have to re-check out, re-check out the project is under the control of SVN, be sure to remember to check out.

Right-click on the svnproject to check it out locally and modify it inside. Now it's time to work happily.
After the checkout, the right-click menu becomes this way.

Submit

Green indicates that the current file has not been modified (the computer will not see the color reboot).

If I now add a line to my new project,. txt, and then save it.

The discovery now turns red, and red indicates that it has been modified.

How to submit changes.
Under the root directory, right-click Submit.

Always remember to enter the submission information (although not input can also be submitted), submission information can be easily viewed later.

Once submitted, you can find the green again.

If you join a new file now. It can be seen in blue. Blue indicates unknown files that are not part of the repository, and unknown files cannot be submitted.

Remember to select Add to add it to the repository.

After the addition, it becomes the Blue plus sign, which indicates the newly added repository file.

Next, just write the code and then commit.
Delete files should also be right-click Submit, as follows.

Remember to check your file status at any time, if not added to the version control to be added in a timely manner, or your file will not be submitted. Update

If you and B are collaborating. b After writing the code submitted to the SVN, if you want to get the latest changes, you need to select the update (if the server has already been submitted by someone else, you are not submitted, you must first update and then submit).
How to know if the server is not updated. You can directly choose the update, there is no update on the know. or right-check the changes and check the repository to see which files are changed on the server.

Right-click to select Head and base comparison.

The left side represents your code, and the right side represents the code on the server.

If there are any changes, remember to update to local and then continue to work.

But sometimes updates conflict, like you and the server change the same place.
At this point you need to update to resolve the conflict.

It will prompt you which file conflicts, you only need to open that file, to resolve the conflict as required.

<<<<<<.mine to = = = = = Your code, other code that represents the server. You just have to change to what you want.