Re: TortoiseMerge (diff tool) and deleted files

On 10.01.2012 22:58, Oliver Bock wrote:
> Prior to 1.7, if a file being diffed was changed then you had to
> explicitly refresh the diff. Now TortoiseMerge automatically detects
> changes. This is great except for the case where the file has been
> deleted, in which case it tells you it has changed, and then complains
> that the file is not there.
>
> I suggest that if one of the source files has been deleted then it do
> nothing, because there is not much useful it can do. My favourite text
> editor (TextPad) works this way.
>
> (Background: I use the diff tool to compare changed regression test
> outputs with good outputs. If I accept the change then the new output
> is deleted, leading to a message box duel with TortoiseMerge when I try
> to close it. This situation could also occur when you have a diff
> related to a conflict open and then you resolve the conflict.)

If one file has been deleted, the check doesn't ask to refresh.
Only if the other file has also been modified, *then* you're asked to
refresh.
But just deleting one or both files doesn't do anything.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2907967
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].