RE: 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.
> ...
>
> 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.

You are right, my apologies. I am replacing the "good" file with the new file. Tortoise detects the change to the "good" file, and then an error appears during the refresh because the new file has disappeared. Sadly for me I can now see that Tortoise is being eminently sensible. Thanks.

  Oliver

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-01-12 06:08:43 CET