SVN:
Visualsvn:http://www.visualsvn.com/server/download
tortoisesvn:http://tortoisesvn.net/downloads.html
Install two software:
1. SVN server, you can use VISUALSVN servers, where you can add users
2. SVN client, can use TORTOISESVN
The first time you download code from a warehouse: Right-click under any folder, SVN Checkout:
URL of repository: server-side warehouse path, local address: https://127.0.0.1:443 (the port selected at the time of servers-side installation)/svn/test/
Checkout Directory:
Place the remote repository on a local folder path
Basic Operation:
SVN Commit: Commit when the local repository is updated, write comments
SVN Update: Pull the remote repository
Show log: For the file, right-click, you can see the submission record, in the submitted record, right-click, you can select the version needs to revert (in the below path can also right-click, save the file to the local disk)
you can also show log in the root directory of SVN
Conflict
There is a conflict when the commit will produce three files,. Mine is the code after self-improvement, rx,ry,x,y two number smaller is my previous code, the number is larger, is the service side of the code
1. If you want to keep your version, overwrite the original code with mine, and resubmit
2. If you think the other side is correct, revert, this time has been the latest code (not necessarily to do so, but so convenient)
3. If the previous version is considered correct, use a smaller version of the overlay (delete the suffix name directly)
experience: If commit failed! Do not order OK to continue to press the update, the first copy of their own code to one side, then the file revert, then update, and then put on the side of the file rename copy to the same folder, select two conflicting files, Tortoiessvn->diff, On the left is the latest code, the right is mine, after resolving the conflict two people better update
Compared to the history: Show log, at the same time select two versions (for example, now to the 10th edition, then 10/9 to compare, to see if there is no difference, then compare 9/8 version, if there is no difference, and so on to continue to compare), Compare revisions
SVN and TortoiseSVN
