Hello Tim and valued TortoiseSVN support volunteers,
Interesting... I came to the forums today to report a "bug" where a
temporary file is created when I don't want one ("Compare two files"), and
your "bug" is that a temporary file is not created when you do want one
(diff an unmodified file). Both of these affect users that edit files in
their diff tool.
I have run into this "bug" (quotes because it is really just "the current
behavior") and I agree that it would be better if TortoiseSVN used a
read-only temporary copy of the unmodified file on the left side of the
compare, and the file on disk on the right side (like it does if the file
was already modified).
It seems that many developers do not ever edit files in their diff tools,
so these "bugs" would never be noticed by them. I frequently edit or
manually synchronize file contents in my diff tools (Beyond Compare, Helix
P4Merge, and WinMerge).
Brad
On Monday, August 28, 2023 at 10:01:44 AM UTC-4 Tim wrote:
> 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/6861f47a-685d-433c-a847-8f4303479306n%40googlegroups.com.
