TortoiseSVN Spenden

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.

Add autocompletion functionality in CInputLogDlg. Code is mostly stolen from CCommitDlg, with a few differences:
- No thread support. It should be /fairly/ quick to create the autocomplete list since it is based on the pathlist without any recursion down the tree.
- No parsing of source files (since they are only available on the server).
- "Paste filename list" paste URLs instead of relative file names.

Code should probably have been factored out of CCommitDialog but that was over my head for now.

Add a BRANCH-README

A feature branch to add autocompletion support in the log dialog used in repobrowser

tools.zip is not needed after extracting. Let's delete it to decrease clutter in the WC.

Discussed: https://groups.google.com/g/tortoisesvn-dev/c/7hQ7m4uk4xI/m/cnX7zJHcAgAJ

BRANCH-README and switch subversion to /trunk

Branch for the new multi-format-wc feature of Subversion 1.15

Re-use the url retrieved using GetWindowText instead of getting it again using GetString.

Discussed https://groups.google.com/g/tortoisesvn-dev/c/aw32jamqpCw

allow mixed rev wcs when reverting from the log dialog

patch from Daniel Sahlberg:
use 3 context lines by default when creating a patch

use GetWindowText since GetString sometimes returns an empty string, trim the string

patch from Daniel Sahlberg:
fix status page

patch from Daniel Sahlberg:
use GetString() to avoid having newlines at the end

remove choco scripts for ipv6 build

remove "upcoming milestone" from status page

always build with ipv6

patch from Daniel Sahlberg:
fix for VS2022

don't clear visible revisions if set externally

update website for the 1.14.3 release

patch from Daniel Sahlberg:
fix for VS2022

patch from Matthias:
remove duplicated lines

update translations from transifex

Merged revision(s) r29386 from branches/1.14.x:
* update to OpenSSL 1.1.1n * apply the openssl patch

Merged revision(s) r29384, r29385 from trunk:
* update to OpenSSL 1.1.1n
* apply the openssl patch

apply the openssl patch