måndag 1 juli 2024 kl. 22:08:43 UTC+2 skrev Scot Werner:

It fails on the same files with the default merge tool in tortoise svn


Is there a common pattern with the files that are failing? File type, 
content etc.?

Without a way to reproduce it is quite difficult to figure out the root 
cause.

Kind regards,
Daniel


 



On Mon, Jul 1, 2024, 3:03 PM Scot Werner <scotwerne...@gmail.com> wrote:

Okay. It works for some files and fails for others. I don't know why.

On Tue, Jun 25, 2024, 3:18 PM Scot Werner <scotwerne...@gmail.com> wrote:

It must have been something with the installation. I uninstalled and did a 
clean installation. Version 1.14.7 works fine now. Sorry about the previous 
email.

On Tue, Jun 25, 2024, 2:54 PM Scot Werner via TortoiseSVN <
torto...@googlegroups.com> wrote:

I have the TortoiseSVN->Settings->Diff Viewer -> Merge Tool set to:
External with

D:\Program Files\KDiff3\bin\kdiff3.exe %base %mine %theirs -o %merged --L1 
Base --L2 Mine --L3 Theirs


I am using KDIFF3 version 1.11.0 (64 bit).

My operating system is Windows 10 Enterprise version 22H2 OS build 
19045.4529.

Steps to reproduce.

1. Select a working copy of a file.

2. Open TortoiseSVN context menu and select Show Log.

3. On show log, select two revisions of a file.  Right click and select 
compare revisions on the pop up context menu.

An error dialog pops up with a title of File open error - KDIFF3 and a 
message in the pop up of:

Opening of these files failed:

- Mine

Opening 
c:/users/.../AppData/Local/Temp/MainWindow.xaml.cs-rev75974.svn003.tmp 
failed.  Unknown error.


I can downgrade TortoiseSVN from version 1.14.7 to 1.14.6.  I can perform 
the same operation, and KDIFF3 opens.  The differences are displayed in 
KDIFF3.

I tried the latest nightly build of 1.14.99 2024/06/21 21:48:08.  This 
fails just like 1.14.7.

Can you please fix this bug?

Scot



-- 
You received this message because you are subscribed to a topic in the 
Google Groups "TortoiseSVN" group.
To unsubscribe from this topic, visit 
https://groups.google.com/d/topic/tortoisesvn/Ty7v3oKZkhk/unsubscribe.
To unsubscribe from this group and all its topics, send an email to 
tortoisesvn...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/tortoisesvn/e4def06d-108a-42c4-b0ca-2e534f3829ecn%40googlegroups.com
 
<https://groups.google.com/d/msgid/tortoisesvn/e4def06d-108a-42c4-b0ca-2e534f3829ecn%40googlegroups.com?utm_medium=email&utm_source=footer>
.

-- 
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 tortoisesvn+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/tortoisesvn/6c2f3d4f-c243-4c19-8ca5-65c085274d11n%40googlegroups.com.

Reply via email to