I think Brad understands my problem. @Stefan, you do not seem to. My problem is that when comparing Working Copy against BASE, that the comparison tool WinMerge gets the same file on both sides from TortoiseSVN. When I then try to edit the Working Copy in the comparison tool, it seems to also edit the BASE, which is screwing up the comparison between the BASE version that was originally there and the now modified "Working Copy" file. In fact, the file passed to WinMerge by TortoiseSVN is the file in the check out folder structure and not any temporary file, created by TortoiseSVN because of diffing.
On Wednesday, August 30, 2023 at 7:11:17 PM UTC+2 Stefan wrote: > There's a reason a temp file is created: > the 'real' file might have svn:keywords expanded or might have other EOLs. > SVN won't show such files as different from the ones in the repository. But > they are different when passing them to a diff tool. > So by default, the file to be diffed is first converted so that the > keywords are removed and EOLs adjusted, that file is then saved to a temp > file so it can be used by the diff tool. > > you can disable this behavior it it bothers you: settings dialog->Diff > Viewer->convert files when diffing against BASE > > -- 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/ceb85c16-c830-4f3a-8659-041414436e17n%40googlegroups.com.
