First, SVN use steps
- Check out Checkout
- Updating update
- Conflict Confilicte
- Adding Add (no items can be added without writing)
- Fill in the SVN log
- Commit Commit
Do you think it's over by here? .... no!!! Go on.
For SVN operations, it is generally not recommended to directly right-click on the Project-team-submit/update; it is recommended to unify the update, add, commit and other transactions in the repository . Because in the repository, there is an intuitive comparison of the files to be changed or changed
Second, the matters needing attention:
- submit the time must be written log (SVN trial and team development, a team may have more than one person to work on a file, if each person submits the time does not record this need to submit the content, may cause later the file error, Unable to timely locate to which one or the time of the submission of the problem, but also for future bug review is not convenient. So when you write the log, you have to change which places, where there are deviations, and then how to solve the deviation to write down);
- must be updated before submission (this is mandatory, because you do not know before you submit the file has been submitted by others have been modified, so the first part of the time, you are required to operate in the repository );
- repeated review to ensure that the correct premise, the diligent update diligent submission (not explained);
- Submit only the files that you have modified, and check whether the documents need to be submitted (not explained) before submitting them.
- Use steps Note:update->add-> Write comments->commit, if a complete transaction, indispensable
Third, other operations of SVN
Finally, a random summary of the commonly used SVN operation for you to crossing too enjoyable ...
- View a file history commit record: Right-click the file--team--Show Resource history (H)
- To compare the differences between the current file and the file in the repository: Right-click the file--compare with
- Replace file/restore: Right-click the file--replace with
Note: Please be careful to replace the operation, please back up when necessary, the replacement operation is irreversible!
- Resolve Conflicts:
Two cases:
① The local file does not modify the code (may add a space in the file, such as invisible operations), this situation is directly restored;
② into the resource pool
Click on the "4" labeled Red Arrow, here will show all the conflicting files: There are two types of conflicting files:1 is more than one person to modify the file, but the changes are different parts ;2 Multiple people modify the file, and two or more of them operate the same piece of code. For the first kind can be directly updated without special treatment, for the second, you need to operate cautiously, must not be a brain update. You can copy your own code and discuss it with another person before deciding what to do. In fact, conflict code, there is no good solution, can only be responsible for coordination between people.
Here's a picture of the library above in a brief introduction to the use of the resource pool:
"1": Repository--local (update)
"2": local--Resource library (Submit)
"3": Contains "1" "2"
"4": Conflict file
"Pure dry" what you should be aware of when using SVN