[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

TortoiseMerge (diff tool) and deleted files

From: Oliver Bock <oliver_at_g7.org>
Date: Wed, 11 Jan 2012 08:58:59 +1100

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.)

   Oliver

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2907685

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-01-11 07:46:48 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.