14 14 ### gpg-agent (Unix-like systems)
15 15 ### keychain (Mac OS X)
16 16 ### windows-cryptoapi (Windows)
17 -password-stores = windows-cryptoapi
17 +# password-stores = gpg-agent,gnome-keyring,kwallet
18 18 ### To disable all password stores, use an empty list:
19 19 # password-stores =
21 +### Set KWallet wallet used by Subversion. If empty or unset,
22 +### then the default network wallet will be used.
25 +### Include PID (Process ID) in Subversion application name when
26 +### using KWallet. It defaults to 'no'.
27 +# kwallet-svn-application-name-with-pid = yes
21 29 ### Set ssl-client-cert-file-prompt to 'yes' to cause the client
22 30 ### to prompt for a path to a client cert file when the server
23 31 ### requests a client cert but no client cert file is found in the
28 36 ### The rest of the [auth] section in this file has been deprecated.
29 37 ### Both 'store-passwords' and 'store-auth-creds' can now be
30 38 ### specified in the 'servers' file in your config directory
31 -### and are documented there. Anything specified in this section
39 +### and are documented there. Anything specified in this section
32 40 ### is overridden by settings specified in the 'servers' file.
33 41 # store-passwords = no
34 42 # store-auth-creds = no
38 46 ### Set editor-cmd to the command used to invoke your text editor.
39 47 ### This will override the environment variables that Subversion
40 -### examines by default to find this information ($EDITOR,
48 +### examines by default to find this information ($EDITOR,
43 51 ### Set diff-cmd to the absolute path of your 'diff' program.
44 52 ### This will override the compile-time default, which is to use
45 53 ### Subversion's internal diff implementation.
54 +# TODO windows versions as bat files
55 +diff-cmd = /home/oli/.subversion/diff
47 56 ### Diff-extensions are arguments passed to an external diff
48 57 ### program or to Subversion's internal diff implementation.
49 58 ### Set diff-extensions to override the default arguments ('-u').
50 -# diff-extensions = --tabs 2
51 60 ### Set diff3-cmd to the absolute path of your 'diff3' program.
52 61 ### This will override the compile-time default, which is to use
53 62 ### Subversion's internal diff3 implementation.
54 -# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
63 +# diff3-cmd = /home/oli/.subversion/diff3
55 64 ### Set diff3-has-program-arg to 'yes' if your 'diff3' program
56 65 ### accepts the '--diff-program' option.
57 -# diff3-has-program-arg = [yes | no]
66 +# diff3-has-program-arg = no
58 67 ### Set merge-tool-cmd to the command used to invoke your external
59 68 ### merging tool of choice. Subversion will pass 5 arguments to
60 69 ### the specified command: base theirs mine merged wcfile
61 -# merge-tool-cmd = merge_command
70 +merge-tool-cmd = /home/oli/.subversion/merge
63 72 ### Section for configuring tunnel agents.
75 84 ### passed to the tunnel agent as <user>@<hostname>.) If the
76 85 ### built-in ssh scheme were not predefined, it could be defined
78 -# ssh = $SVN_SSH ssh -q
87 +# ssh = $SVN_SSH ssh -q -o ControlMaster=no --
79 88 ### If you wanted to define a new 'rsh' scheme, to be used with
80 89 ### 'svn+rsh:' URLs, you could do so as follows:
82 91 ### Or, if you wanted to specify a full path and arguments:
83 -# rsh = /path/to/rsh -l myusername
92 +# rsh = /path/to/rsh -l myusername --
84 93 ### On Windows, if you are specifying a full path to a command,
85 94 ### use a forward slash (/) or a paired backslash (\\) as the
86 95 ### path separator. A single backslash will be treated as an
89 98 ### Section for configuring miscellaneous Subversion options.
92 100 ### Set global-ignores to a set of whitespace-delimited globs
93 101 ### which Subversion will ignore in its 'status' output, and
94 102 ### while importing or adding files and directories.
96 104 # global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__
97 105 # *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db
98 106 ### Set log-encoding to the default encoding for log messages
107 +# log-encoding = latin1
100 108 ### Set use-commit-times to make checkout/update/switch/revert
101 109 ### put last-committed timestamps on every file touched.
102 110 # use-commit-times = yes