[BUG] TortiseSVN 1.14.4 introduced bug that suddenly uses 'ignore ancestry' when merging from show log window

86 views
Skip to first unread message

Justin Carman

unread,
Feb 27, 2023, 2:14:32 PM2/27/23
to TortoiseSVN
Hi there,

Beginning in 1.14.4 (and continued in 1.14.5), TSVN uses the 'ignore ancestry' option when using Show Log > Merge Revisions > Select target. This is a departure from the past, and there appears to be no option in settings to disable/change this behavior. Using the Merge Wizard does work, and does not default the 'ignore ancestry' checkbox.

Setup:
TortoiseSVN 1.14.4, Build 29455 - 64 Bit , 2022/09/23 08:10:37
ipv6 enabled
Subversion 1.14.1, -release
apr 1.6.5
apr-util 1.6.1
serf 1.3.9
OpenSSL 1.1.1n  15 Mar 2022
zlib 1.2.11
SQLite 3.36.0

Thanks!
Justin

Daniel Sahlberg

unread,
Mar 1, 2023, 5:37:22 AM3/1/23
to TortoiseSVN
Can you try the latest nightly build to see if it makes a difference. It seems there was a change in r29531: https://osdn.net/projects/tortoisesvn/scm/svn/commits/29531  (see line 5835).

Kind regards
/Daniel

Justin Carman

unread,
Mar 1, 2023, 10:39:19 AM3/1/23
to TortoiseSVN
Hi Daniel,

Awesome! I just tried the latest nightly and that resolved the issue.

Thanks!
Justin

Reply all
Reply to author
Forward
Message has been deleted
0 new messages