SVN experience 2

The test.doc file on the client side of 11、was renamed hello. rtf (renamed using SVN), but its history still contains the information before renaming and can be extracted from previous versions. Creating another test.doc will not be confused. (You need to remove the check box of the Stop on copy/rename option when viewing the historical records)

 

12. SVN replication is special. If you copy a directory, it does not actually completely copy all the files in the directory. It is just the portal to create a directory tree, you can think of it as a shortcut. Even if the file in your new directory has been changed, it only updates the file you modified. Other files are also the Mappings of the original folder, no changes.

 

13. Modifications to files on the trunk and Branch do not affect each other. After all the work on the branch is completed, all the branch modifications can be copied back to the trunk.

 

14. To merge files of the same name, you can first use SVN diff to view the differences between files, and then use the svn Merge function to merge files.

 

15. If a version conflict needs to be resolved, three files with the same name will be generated in the local directory, the initial version (on the left side of the comparison) and the final version (on the right side of the comparison) and receive different copies of work (the merging target ). Manually merge versions by comparison. If you do not need to merge local modifications to the server by comparison, use revert to roll back.

 

16. manual tracking and merging: SVN cannot automatically merge conflicts completely. A more appropriate method is to describe the specific version number (or version number range) in the log information submitted by the version ), in this way, the svn log can be run during the merge to view the modifications contained in the branch. This can help merge in sequence without unnecessary merging.

 

17. Preview and merge: when the copy operation has changed, the merge operation will target the existing file, and running the revert will not recover the local modification. The changes in the two parts cannot be identified. A simple way to solve this problem is to use diff to preview the changes. by displaying the status information during merging, you can get the "Overall" preview after merging.

 

18. Differences between SVN diff and SVN merge:

Rename test.doc0000100as ceshi.doc. at the same time, a new file named test.doc is version 102.

The difference is as follows:

The SVN diff command ignores the ancestor. the diff command simply compares the two files under the two channels.

SVN mergeis a comparison between two objects. The two test.doc files uploaded to iis100and 2017102are not associated.

 

19. SVN does not really rename it. The move command is only a combination of the copy and delete commands.

 

20. Retrieve deleted items: even if a file or directory is deleted, SVN information is never lost, but it disappears from the current head version, but it still exists in earlier versions. You only need to use the svn log to view the version of each changed project and find the version of the file or directory you deleted.