To find out what the different settings are for, just leave your mouse pointer a second on the editbox/checkbox... and a helpful tooltip will popup.
This dialog allows you to specify your preferred language, and the Subversion-specific settings.
- Language
Selects your user interface language. What else did you expect?
- Automatically check for newer versions every week
If checked, TortoiseSVN will contact its download site once a week to see if there is a newer version of the program available.
- System sounds
TortoiseSVN has three custom sounds which are installed by default.
Error
Notice
Warning
You can select different sounds (or turn these sounds off completely) using the Windows Control Panel. This button is a shortcut to the Control Panel.
- Exclude/Ignore pattern
Exclude patterns are used to prevent unversioned files from showing up e.g. in the commit dialog. Files matching the patterns are also ignored by an import. Exclude files or directories by typing in the names or extensions. Patterns are separated by spaces e.g.
*/bin */obj *.bak *.~?? *.jar *.[Tt]mp. The first two entries refer to directories, the other four to files. These patterns use filename globbing. Read the section called “Filename Globbing in Ignore Lists” for more information.Note that the exclude patterns you specify here will also affect other Subversion clients running on your PC, including the command line client.
Caution
If you use the Subversion configuration file to set a
global-ignorespattern, it will override the settings you made here. The Subversion configuration file is accessed using the as described below.This exclude pattern will affect all your projects. It is not versioned, so it will not affect other users. By contrast you can also use the versioned
svn:ignoreproperty to exclude files or directories from version control. Read the section called “Ignoring Files And Directories” for more information.- Set filedates to the "last commit time"
This option tells TortoiseSVN to set the filedates to the last commit time when doing a checkout or an update. Otherwise TortoiseSVN will use the current date. If you are developing software it is generally best to use the current date because build systems normally look at the datestamps to decide which files need compiling. If you use "last commit time" and revert to an older file revision, your project may not compile as you expect it to.
- Edit...
... the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseSVN, and need to be set here instead. For more information about the Subversion
configfile see the Subversion Manual . The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more.- Clear Auth Cache
When you authenticate with a subversion server, the username and password are cached locally so you don't have to keep entering them. To clear everything from that cache, use this button.
This page allows you to specify which of the TortoiseSVN context menu entries will show up in the main context menu, and which will appear in the TortoiseSVN submenu. By default most items are checked and appear in the submenu.
If you have a very large number of files in your working copy
folders, it can take a long time before the context menu appears
when you right click on a folder. This is because
Subversion fetches the status for all files when you ask for
folder status. To avoid this delay you can uncheck the
Fetch status for context menu
box. Be warned that the context menu for folders will not always
be correct, and may include items which should not really be there.
For example, you will see
→
for an Added folder, which will not work because
the folder is not yet in the repository.
This page allows you to choose the items for which TortoiseSVN will display icon overlays. Network drives can be very slow, so by default icons are not shown for working copies located on network shares. You can even disable all icon overlays, but where's the fun in that?
By default, overlay icons will appear in all open/save dialogs as well as in Windows Explorer. If you want them to appear only in Windows Explorer, check the Show overlays only in explorer box.
Normally the icon overlays act recursively, which means that the overlay for a folder shows the most significant status of all its subfolders. If there is a modified file deep in the hierarchy, the top level folder will also show modified status to remind you that there are buried changes. If you have very large working copies then you may find that the recursive status feature causes too much disk activity and disruption on your system, although this is not usually a problem. In that case you can uncheck Show overlay status icons recursively so that folder status is shown only for the folder itself.
The Exclude Paths are used to tell TortoiseSVN for which paths not to show icon overlays and status columns. This is useful if you have some very big working copies containing only libraries which you won't change at all and therefore don't need the overlays. For example:
f:\development\SVN\Subversion will disable
the overlays on only that specific folder. You
still can see the overlays on all files and folder inside that folder.
f:\development\SVN\Subversion* will disable the
overlays on all files and folders whose path
starts with f:\development\SVN\Subversion. That
means you won't see overlays for any files and folders below that
path.
The same applies to the Include Paths. Except that for those paths the overlays are shown even if the overlays are disabled for that specific drive type.
You can change the overlay icon set to the one you like best. Note that if you change overlay set, you may have to restart your computer for the changes to take effect.
This dialog allows you to configure some of TortoiseSVN's dialogs the way you like them.
- Default number of log messages
Limits the number of log messages that TortoiseSVN fetches when you first select → Useful for slow server connections. You can always use or to get more messages.
- Font for log messages
Selects the font face and size used to display the log message itself in the middle pane of the Revision Log dialog, and when composing log messages in the Commit dialog.
- Short date / time format in log messages
If the standard long messages use up too much space on your screen use the short format.
- Progress Dialog
TortoiseSVN can automatically close all progress dialogs when the action is finished without error. This setting allows you to select the conditions for closing the dialogs. The default (recommended) setting is Close manually which allows you to review all messages and check what has happened. However, you may decide that you want to ignore some types of message and have the dialog close automatically if there are no critical changes.
Auto-close if no merges, adds or deletes means that the progress dialog will close if there were simple updates, but if changes from the repository were merged with yours, or if any files were added or deleted, the dialog will remain open.
Auto-close if no conflicts relaxes the criteria further and will close the dialog even if there were merges, adds or deletes. However, if there were any conflicts or errors, the dialog remains open.
Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date.
- Use URL of WC as the default "From:" URL
In the merge dialog, the default behaviour is for the From: URL to be remembered between merges. However, some people like to perform merges from many different points in their hierarchy, and find it easier to start out with the URL of the current working copy. This can then be edited to refer to a parallel path on another branch.
- Recurse into unversioned folders
If this box is checked (default state), then whenever the status of an unversioned folder is shown in the Add, Commit or Check for Modifications dialog, every child file and folder is also shown. If you uncheck this box, only the unversioned parent is shown. Unchecking reduces clutter in these dialogs. In that case if you select an unversioned folder for Add, it is added recursively.
- Use autocompletion of filepaths and keywords
The commit dialog includes a facility to parse the list of filenames being committed. When you type the first 3 letters of an item in the list, the autocompletion box pops up, and you can press Enter to complete the filename. Check the box to enable this feature.
- Timeout in seconds to stop the autocompletion parsing
The autocompletion parser can be quite slow if there are a lot of large files to check. This timeout stops the commit dialog being held up for too long. If you are missing important autocompletion information, you can extend the timeout.
- Only use spellchecker when tsvn:projectlanguage is set
If you don't wish to use the spellchecker for all commits, check this box. The spellchecker will still be enabled where the project properties require it.
- Contact the repository on startup
The Check for Modifications dialog checks the working copy by default, and only contacts the repository when you click . If you always want to check the repository, you can use this setting to make that action happen automatically.
This dialog allows you to configure the text colours used in TortoiseSVN's dialogs the way you like them.
- Possible or real conflict / obstructed
A conflict has occurred during update, or may occur during merge. Update is obstructed by an existing unversioned file/folder of the same name as a versioned one.
This colour is also used for error messages in the progress dialogs.
- Added files
Items added to the repository.
- Missing / deleted / replaced
Items deleted from the repository, missing from the working copy, or deleted from the working copy and replaced with another file of the same name.
- Merged
Changes from the repository successfully merged into the WC without creating any conflicts.
- Modified / copied
Add with history, or paths copied in the repository. Also used in the log dialog for entries which include copied items.
- Deleted node
An item which has been deleted from the repository.
- Added node
An item which has been added to the repository, by an add, copy or move operation.
- Renamed node
An item which has been renamed within the repository.
- Replaced node
The original item has been deleted and a new item with the same name replaces it.
Here you can configure your proxy server, if you need one to get through your company's firewall.
If you need to set up per-repository proxy settings, you will
need to use the Subversion servers file to
configure this. Use to get there
directly. Consult the
Subversion Manual
for details on how to use this file.
You can also specify which program TortoiseSVN should use to establish a secure connection to a svn+ssh repository. We recommend that you use TortoisePlink.exe. This is a version of the popular Plink program, and is included with TortoiseSVN.
Here you can define your own diff/merge programs that TortoiseSVN should use. The basic setting is to use the builtin TortoiseMerge which is installed alongside TortoiseSVN.
Read the section called “External Diff/Merge Tools” for a list of some of the external diff/merge programs that people are using with TortoiseSVN.
An external diff program may be used for comparing different
revisions of files. The external program will need to
obtain the filenames from the command line, along with
any other command line options. TortoiseSVN uses
substitution parameters prefixed with %.
When it encounters one of these it will substitute the
appropriate value. The order of the parameters will depend
on the Diff program you use.
- %base
The original file without your changes
- %bname
The window title for the base file
- %mine
Your own file, with your changes
- %yname
The window title for your file
The window titles are not pure filenames.
TortoiseSVN treats that as a name to display and creates
the names accordingly. So e.g. if you're doing a
diff from a file in revision 123 with a file
in your working copy, the names will be
filename : revision 123
and
filename : working copy
For example, with ExamDiff Pro:
C:\Path-To\ExamDiff.exe %base %mine
or with KDiff3:
C:\Path-To\kdiff3.exe %base %mine --L1 %bname --L2 %yname
or with WinMerge:
C:\Path-To\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine
or with Araxis:
C:\Path-To\compare.exe /max /wait /title1:%bname /title2:%yname
%base %mine
If you use the svn:keywords property to
expand keywords, and in particular the revision
of a file, then there may be a difference between files which
is purely due to the current value of the keyword. Also if you use
svn:eol-style = native the BAsE file will have
pure LF line endings whereas your file will
have CR-LF line endings. TSVN will normally hide
these differences automatically by first parsing the BASE file to
expand keywords and line endings before doing the diff operation.
However, this can take a long time with large files. If
Convert files when diffing against BASE
is unchecked then TSVN will skip pre-processing the files.
An external merge program used to resolve conflicted files. Parameter substitution is used in the same way as with the Diff Program.
- %base
the original file without your or the others changes
- %bname
The window title for the base file
- %mine
your own file, with your changes
- %yname
The window title for your file
- %theirs
the file as it is in the repository
- %tname
The window title for the file in the repository
- %merged
the conflicted file, the result of the merge operation
- %mname
The window title for the merged file
For example, with Perforce Merge:
C:\Path-To\P4Merge.exe %base %theirs %mine %merged
or with KDiff3:
C:\Path-To\kdiff3.exe %base %mine %theirs -o %merged
--L1 %bname --L2 %yname --L3 %tname
or with Araxis:
C:\Path-To\compare.exe /max /wait /3 /title1:%tname /title2:%bname
/title3:%yname %theirs %base %mine %merged /a2
In the advanced settings, you can define a different diff and merge program for every file extension. For instance you could associate Photoshop as the “Diff” Program for .jpg files :-)
You need to specify just the extension with no leading dot or wildcard.
Use BMP to describe Windows bitmap files,
not
*.BMP.
A viewer program for unified-diff files (patch files). If you don't have one the builtin option is to use NotePad. No parameters are required.
The original Windows NotePad program does not behave well on files which do not have standard CR-LF line-endings. Since most unified diff files have pure LF line-endings, they do not view well in NotePad. However, you can download a free NotePad replacement Notepad2 which not only displays the line-endings correctly, but also colour codes the added and removed lines.