CENTOS7 builds SVN and client usage Guidelines (tortoise) __SVN

1:server Build Reprint: Https://blog.csdn.net/helijie92902/article/details/51935122?foxhandler=RssReadRenderProcessHandler

2:client Build Reprint: https://blog.csdn.net/maplejaw_/article/details/52874348

This article stems from the June to the company's new training on SVN use, in the blink of an eye has been a few months, lost is also a pity, and then sorted out hope to help up-and quick start.

Installation instructions Check out Project Import Project submit update view Log version rollback version control summary

Installation Instructions

Developers strongly recommend using the SVN plug-in in the IDE to be smarter and more humane.

First install the SVN client, Windows generally select Turtle Client https://tortoisesvn.net/downloads.html. (Contains language packs)
Select the appropriate client to install based on the number of system digits.

If you prefer to use the command line, make sure that you remember to check command line client tool for Will is install on the local hard driver without having to 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. The discovery of tortoisesvn means that the installation was successful.

If the Install Command line tool is checked, enter the command SVN and the following prompts also indicate that the installation was successful

But now the menu is all in English, if you are not accustomed to English, you can download the language pack (client the same page), remember the number of system digits.

After installing the language pack, you can right-click into the setting setting.

Choose your preferred language (such as Chinese), and then make sure that the language is now switched to Chinese without any surprises.

The installation tutorial is over, so let's start with the use of SVN. Instructions for use Check out Items

If the project is already in the server's warehouse, now all you have to do is check it out to the local.
Create an empty folder first. Right-click in an empty folder and select SVN checkout.

Now you see this should be the interface, fill in the version library address, choose OK.

A dialog box will pop up to let you enter your account password and enter your account password. Remember to check to save the certification, or each operation will let you enter.

You can check it out in a few minutes.

At this point you can see your project in your catalogue and you can start a pleasant work now.

Import Project

But sometimes you've built your project locally, and you need to push your project to SVN, and what to do now.
Right-click to select a version library browser.

In the appropriate directory, right-click, add File/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 submit information. So that others can know what you have done.

The catalog will be visible when the import succeeds.

However, do not think that the success of the import can be. You'll have to check out again, and the checked out project is under SVN control, so remember to check it out.

Right-click on the Svnproject to the local, and then make changes inside. Now it's time to work happily.
The right button menu after checking out becomes this.

Submit

Green means that the current file has not been modified (it would be nice to see the computer restart without the color).

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

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

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

It is important to remember to enter the submission information (although not input can be submitted), the submission of information can be easily viewed later.

Once the submission is complete, you can find that you are back in green.

If you are adding a new file now. It can be seen in blue. Blue indicates an unknown file that is not part of the version library, and an unknown file cannot be submitted.

Remember to select Add to add it to the version library.

When the addition is complete, it becomes a blue plus sign, representing the newly added version library file.

Next, just write the code and then submit it.
Delete files should also be submitted by right-clicking, as follows.

Remember to check your file status at any time, if not added to version control to be added in time, otherwise your file submission does not go up. Update

If you and B students in collaboration. b classmate wrote the code submitted to SVN, if you want to get the latest changes, you need to choose to update (if the server has been someone else submitted a new, you are not submitted, you must first update before submitting).
How to know if the server has been updated. You can choose to update directly, there is no update to know. or right-check the changes, and then check the version library, you can see the server changed which files.

Right-click to select Head and base comparisons.

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

If there is a change remember to update to the local and then continue to work.

But sometimes updates can conflict, like you and the server changed the same place.
This time you need to update to resolve the conflict.

It prompts you which file conflict, you just open that file and resolve the conflict according to the requirements.

<<<<<<.mine to = = = Your code, others represent the server's code. You just have to change what you want.

Then select the solution and tell SVN that I have resolved the conflict.

The rest is the update submission of the team collaboration, not to repeat. View Log

By selecting the display log, you can see what people inside the team have done.

Can see who who, what time, what to do. The last column of information was written when you submitted it. We suggest that you submit faction necessary to fill in the submission information so that others can see what you have done. Submitting information is also good for you, for a long time can also see what has been done.

version rollback

If you have changed something, but have not yet submitted it, you can use the Restore function.

But what if we write the wrong thing and submit it. Version rollback allows you to restore the file to
Previous version. Right-click to update to version, select the version by viewing the log, and then roll back.

Sometimes we need to view the previous version of the Code. At this point we can create a new folder to check out to the specified version.

Version Control

There are several ways to version control, as follows.

This is one of the easiest ways to add version information when you submit a release build.

Playing label
Labels should be labeled each time a release is made. Right-click to select Branch/tag. Label on to path with version number


So you have a v1.0 version of the label.
Later if you want to view a version of the code, just switch to the past.
Summary

In our daily use, the most common is the update and submit operations. These two steps must be very skilled. Others can see the document in the face of the problem. In addition, it should be noted that all version control tools can only track text files (you can open the viewed files in Notepad), and don't be paranoid that SVN can record which line of word you changed. Once you encounter a word conflict, remember to compare the two versions carefully, and then resolve the conflict.