Subversion

Check svn:mergeinfo in target subtree when preparing for merge

Select this option if you want PyCharm to check the merge tracking information for the target branch before merging to prevent duplicates.

Maximum number of revisions to look back in annotations

Select this option to limit the number of revisions to look back at when calculating annotations, and specify the number of revisions.

Show merge source in history and annotations

Select this option if you want merge sources to be visible in annotations and file history.

Ignore whitespace differences in annotations

Select this option if you want white spaces to be ignored when annotating, and, thus, get more meaningful annotations and cast out senseless ones.

Use PyCharm general proxy settings as default for Subversion

Select this option if you want Subversion to use the default PyCharm proxy settings.

HTTP timeout

Specify the number of seconds to wait for HTTP connection to be established.

SSH connection timeout

Specify the number of seconds to wait for SSH connection to be established.

SSH read timeout

Specify the number of seconds to wait for response.

SSL protocols

In this area, select which SSL protocol you want to use. The available options are:

• All

• SSLv3

• TLSv1

Edit Network Options

Click this button to change Subversion runtime configuration file in the Edit Subversion options related to the network layers dialog.

SSH executable

Specify the path to the SSH client. Enter the name of the executable file, or click the Browse button and select the path in the dialog that opens. If not specified, 'ssh' is used by default.

This field is only available if the Password or the Private key option is selected.

Username

Specify the username for SSH connection. If the username is explicitly specified in the repository URL, this value will be used and this setting will be ignored.

This field is only available if the Password or the Private key option is selected.

Port

If your server is listening on a non-standard port (22 for svn+ssh://), modify the default value.

This field is only available if the Password or the Private key option is selected.

Password

Select this option if you want to use a password for SSH authentication.

Private key

Select this option if you want to use a private key for SSH authentication.

Path

Specify the path to the private key. Enter the path manually, or click the Browse button and select the path in the dialog that opens.

Subversion config

Select this option if you want to use the default settings stored in Subversion configuration for SSH connection.

SSH tunnel

This field displays the SSH tunnel settings stored in Subversion configuration. You can modify the value and click the Update button to write this value to the Subversion configuration.

Update

Click this button to check the Subversion configuration and update the value if necessary, or to write the value you have entered to the Subversion configuration.

SVN_SSH

This field displays the environment variable that can be used in the tunnel configuration (by default, SVN_SSH) and is stored in Subversion configuration.