SVN use experience Two

11, even if the client's file Test.doc was renamed HELLO.RTF (using SVN rename), its history still contains the renamed previous information and can be extracted from the previous version. Even a new test.doc will not be confusing. (You need to remove the check box for the stop on Copy/rename option when viewing the history record)

<?xml:namespace prefix = o ns = "Urn:schemas-microsoft-com:office:office"/>

12, SVN replication is more special, if you copy a directory, it does not actually copy all the files in the directory, it just creates a directory tree entry, you can think of it as a shortcut, even if the file in your new directory has changed, it will only update the file you modified, The other file is still mapped to the original folder and has not changed.

13, on the backbone and the branch of the file changes. When all work is done on the branch, all branch modifications can be copied back to the trunk.

14. Merging files with the same name allows you to view the differences between files using SVN diff, and then merge the files with the SVN merge feature.

15. If you need to resolve version conflicts, you will produce three files with the same name in the local directory, the original version (on the left side of the comparison), the final version (on the right side of the comparison), the working copy of the difference (the target of the merge). By comparing the versions manually, if you do not need to merge local modifications to the server by comparison, use the revert rollback.

16, Manual Tracking Merge: svn does not completely automatically merge conflicts, the more appropriate method is in the version of the log information submitted to the merged specific version number (or version number range), so wait until the merge can run SVN log to see what changes the branch contains. This helps to merge in sequence without unnecessary consolidation.

17, preview Merge: When the work copy has changed, the merge will be for the existing one file, then run revert will not be restored in the local changes, two parts of the modification is not recognized. A simple way to solve this problem is to use diff to preview the Change section, and to get a "whole" preview after the merge by displaying the state information at the time of the merge.

18. The difference between SVN diff and svn merge:

Rename Test.doc version 100 to Ceshi.doc, and create a new file Test.doc for version 102.

So the difference comes out:

The SVN diff command ignores Ancestors, and the diff command simply compares the two files in two paths.

The SVN merge is a comparison of two objects, noting that version 100 and version 102 of Test.doc two files are not associated.

19, SVN does not have a real sense of renaming, the move command is just copy, delete the combination of two commands.

20, retrieve Deleted Items: Even if you delete the file or directory, SVN information is never lost, but disappeared from the current head version, but still exists in the previous version of history. Just look through the SVN log to see all the changed versions of each item and find out which version of the file or directory you deleted.