TortoiseSVN Donation

make member function const

manually load the scilexer.dll on startup

replace OutputDebugString with CTraceToOutputDebugString

disable thread library calls

fix compiler warning

add a "Commit" button to the changed-for-modifications dialog

fix finding the script path with %REPOROOT%

fix TortoisePlink build

Fix graphics inconsistency in Log/project monitor: The file listview was slightly too large and overlapped the loginfo text.

Reported by: Andreas Gorb

https://mail.google.com/mail/u/0/#inbox/WhctKKXXJwxhVWBKqxWVJRTZTwcjQpNbmbZDltSTFfhrXlbWftTLkltCWWDpXgFMXZnsPBB

add an empty ipv6 target to avoid old build scripts from failing

set the MFC visual manager before creating the ribbon

apply the TortoisePlink patch

add missing file and enable encryptions via defines

update to Putty 0.77

don't reset the modified state when redo after saving

`from __future__ ` should be the first non-comment line in a file

Migrate xml2po.py scripts to Python3. (*checkpointing* ... so far only tested on Linux)

Bash version of CheckIDD.bat

Set executable property on all py scripts. It doesn't affect Windows but helps if someone tries to run them on *nix.

Make Python3 compatible

s/http/https/

Further checkpointing. Most everything should now be completed

* dialog titles.txt
old.nabble doesn't seem to exist. What to do with the reference?

* dug_settings_advanced.xml
Reference to old Google Code bug doesn't work. Any other example?

* dug_settings_hooks.xml
Remove reference to Gurtle and Google Code? Is there a better example?

TODO: There are still a bunch of examples using make-up domains (mydomain.org, collab.net etc.). Some have already been changed to example.com, rework the rest.

s/http/https/ in the documentation

Checkpointing my progress. Most changes are self explanitory.

Some are for discussing options:
* tsvn_app_admins.xml
Old KB article that doesn't exists anymore on how to install MSIs through a GPO on Win2000. Document an unofficial mirror.

* tsvn_app_lang.xml
Replaced with a new link to, probably, the same page. However it doesn't serve dictionary files anymore.

* dug_bugtracker.xml
References old tsvn issue tracker.
- Remove bugtraq:url property from the tsvn repo?

* dug_general.xml
The URL is 504 Gateway timeout for me. It is possible to access via archive.org

* checkout_links.xml
An image on the website now has a hex string as part of the file name. Is it predictable or better to link to the repo?

branch for updating docs (and source?) to https when pointing to external sites whenever possible.
there will also be minor updates, for example when the external site has disappeared.

remove obsolete branches

Merge the branch autocomplete_in_repobrowser_logdlg to add autocompletion to the log dialog used in Repobrowser

Add Changelog entry

patch from Denis Kovalchuk:
Automatically resolve tree conflicts using the recommended resolution option
when it's available. The change applies to the TortoiseSVN Merge, Switch,
Update and Resolve commands.

Subversion behaves this way starting from version 1.10.

The relevant links are:
https://svn.apache.org/r1783500
https://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?view=markup#l1801

src/SVN/SVN.cpp:
src/SVN/SVN.h:

Implement SVN::ResolveTreeConflictById() method.

src/TortoiseProc/Commands/ConflictEditorCommand.cpp:
src/TortoiseProc/Commands/ConflictEditorCommand.h:

First try to automatically resolve a tree conflict. If it fails, fall back to
manual resolution.

src/TortoiseProc/SVNProgressDlg.cpp:
src/TortoiseProc/SVNProgressDlg.h:

For the Merge command, try to automatically resolve tree conflicts. If it
fails, fall back to manual resolution. For the Switch and Update commands, only
try the auto resolution.

revert part of r29410: GetAppDirectory() != GetAppDataDirectory()

Change CCommitDlg::GetAutocompletionList similar to CInputLogDlg::GetAutocompletionList:
* don't use the _T() macro, use wide strings instead
* avoid an unnecessary copy when using auto

* don't use the _T() macro, use wide strings instead
* avoid an unnecessary copy when using auto

small refactoring to avoid duplicate code: move the ParseSnippetFile method to the CSciEdit control as a global function and use that from the CCommitDlg and CInputLogDlg.