Hi TortoiseSVN support team, I have TortoiseSVN and WinMerge installed and have setup WinMerge as the diff tool for TortoiseSVN. Today, I am taking over changes between 2 folders compared with WinMerge over to a working copy of a branch with different SVN history. I am using the mentioned WinMerge window on one monitor to go through the modified code lines. In parallel, I have a TortoiseSVN - Check For Modifications window open and try to modify the files in it adding the changes found in the WinMerge window. To see all files in the TortoiseSVN window, I checked the box for showing the unmodified files. When I double-click an unmodified file in this view, it opens a WinMerge comparison window with the file. WinMerge then displays that the same file is open on both sides and is compared. The left side has as title the file name and "Working base", while on the title on the right is the file name and "Working copy". When I add changes on the "Working Copy" side and then save it, WinMerge then notifies twice that the file has changed and asks whether it shall load the new version. I confirm with "Yes" both times. Afterwards, there are no difference between the sides shown. Is this wanted and expected behavior? If it is, can there be, or is there, a TortoiseSVN setting, something like a checkbox in the TortoiseSVN global settings, that would store a copy of the "Working base" file somewhere and then let WinMerge compare that copy against the Working copy file, with the intent that the changes are highlighted and visible in WinMerge when changing the contents of the Working copy file within WinMerge? Thanks, Tim
-- 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/ce1bee20-6f4d-443a-8e5a-4eb5c6b3b083n%40googlegroups.com.
