måndag 27 februari 2023 kl. 20:14:32 UTC+1 skrev [email protected]: 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 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 -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/90fbe8c6-65fe-41f8-b137-811f3ddd5f46n%40googlegroups.com.
