TortoiseSVN
iv
4.2. Importing Data Into A Repository .................................................................................... 29
4.2.1. Import ............................................................................................................... 29
4.2.2. Import in Place ................................................................................................... 31
4.2.3. Special Files ....................................................................................................... 31
4.3. Checking Out A Working Copy ....................................................................................... 31
4.3.1. Checkout Depth .................................................................................................. 33
4.3.2. Store pristine copies ............................................................................................ 34
4.4. Committing Your Changes To The Repository .................................................................... 35
4.4.1. The Commit Dialog ............................................................................................. 35
4.4.2. Change Lists ...................................................................................................... 37
4.4.3. Commit only parts of files .................................................................................... 37
4.4.4. Excluding Items from the Commit List ................................................................... 38
4.4.5. Commit Log Messages ......................................................................................... 38
4.4.6. Commit Progress ................................................................................................. 40
4.5. Update Your Working Copy With Changes From Others ...................................................... 41
4.6. Resolving Conflicts ........................................................................................................ 42
4.6.1. File Conflicts ...................................................................................................... 43
4.6.2. Property Conflicts ............................................................................................... 44
4.6.3. Tree Conflicts ..................................................................................................... 44
4.7. Getting Status Information .............................................................................................. 47
4.7.1. Icon Overlays ..................................................................................................... 47
4.7.2. Detailed Status .................................................................................................... 48
4.7.3. Local and Remote Status ...................................................................................... 50
4.7.4. Viewing Diffs ..................................................................................................... 52
4.8. Change Lists ................................................................................................................. 52
4.9. Shelving ....................................................................................................................... 54
4.10. Revision Log Dialog ..................................................................................................... 56
4.10.1. Invoking the Revision Log Dialog ........................................................................ 57
4.10.2. Revision Log Actions ......................................................................................... 58
4.10.3. Getting Additional Information ............................................................................ 59
4.10.4. Getting more log messages .................................................................................. 65
4.10.5. Current Working Copy Revision .......................................................................... 66
4.10.6. Merge Tracking Features .................................................................................... 66
4.10.7. Changing the Log Message and Author ................................................................. 67
4.10.8. Filtering Log Messages ....................................................................................... 67
4.10.9. Statistical Information ........................................................................................ 69
4.10.10. Offline Mode .................................................................................................. 72
4.10.11. Refreshing the View ......................................................................................... 72
4.11. Viewing Differences ..................................................................................................... 72
4.11.1. File Differences ................................................................................................. 73
4.11.2. Line-end and Whitespace Options ......................................................................... 74
4.11.3. Comparing Folders ............................................................................................ 74
4.11.4. Diffing Images Using TortoiseIDiff ...................................................................... 76
4.11.5. Diffing Office Documents ................................................................................... 77
4.11.6. External Diff/Merge Tools .................................................................................. 77
4.12. Adding New Files And Directories .................................................................................. 78
4.13. Copying/Moving/Renaming Files and Folders ................................................................... 78
4.14. Ignoring Files And Directories ....................................................................................... 80
4.14.1. Pattern Matching in Ignore Lists .......................................................................... 80
4.15. Deleting, Moving and Renaming ..................................................................................... 81
4.15.1. Deleting files and folders .................................................................................... 82
4.15.2. Moving files and folders ..................................................................................... 83
4.15.3. Dealing with filename case conflicts ..................................................................... 84
4.15.4. Repairing File Renames ...................................................................................... 84
4.15.5. Deleting Unversioned Files ................................................................................. 84
4.16. Undo Changes ............................................................................................................. 84
4.17. Cleanup ...................................................................................................................... 86
4.18. Project Settings ............................................................................................................ 87
