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

Re: TortoiseMerge and files changing on disk

From: Oto BREZINA <otik_at_printflow.eu>
Date: Tue, 05 Jul 2011 09:20:38 +0200

On 2011-07-04 19:49, Stefan Küng wrote:
> On 04.07.2011 17:26, Hans-Emil Skogh wrote:
>> Hi!
>>
>> If a file changes on disk and I say "no" to the question if I want to update the file in TortoiseMerge, I would expect the file(s) to be marked as modified in TortoiseMerge.
>>
>> This to inform me that the file that I'm looking at in TortoiseMerge is not identical with the one on disk. This will also promt a save-dialog when TortoiseMerge is closed, which is good to prevent possible loss of data.
> Good idea!
> Done in r21655.
Quite agree, but from your code, it seems that it will mark modified
right file even left and/or bottom, but not right changed ... etc.
However Did not tested.

Oto

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-05 09:20:54 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.