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

Re: [tortoisesvn] r23280 committed - When resolving a conflict, make TMerge ask for saving modifications on...

From: Oto BREZINA <otik_at_printflow.eu>
Date: Tue, 18 Sep 2012 21:36:44 +0200

On 2012-09-18 21:14, Stefan Küng wrote:
> On 18.09.2012 21:04, Oto BREZINA wrote:
>> But...
>> Just I had case when update result in conflict. There were new line
>> style changes only so there is no conflict shown in T-Merge. When I
>> closed T-Merge question Save | Exit | Cancel apeared. I used Save,
>> because I wanted to save resolved version. That happen and disk I have
>> resolved version of file (without "<<<<<<< .mine"), however file state
>> is still "conflicted".
>> My suggestion remains: Resolve option. As for rare case Save can be used
>> as well it can be kept, but Resolve is what I would expect here.
> Sure the state remains conflicted: Only if you use the "resolved"
> command, then the state changes to resolved.
Then I'm missing then option in that dialog on closing. That's what I
expected from reading corresponding issue 411.
> TMerge can not mark a file as resolved, because it has no knowledge
> about working copies.
Sorry. I miss point about save on closing dialog then .... as well as
issue 411.

There is Resolve button on ribbon, which works - T-Merge know everything
it needs (expecting it is used with TSVN).
When closing T-Merge dialog apears where you can save file. But Using
"Edit conflict" again on that you lose any changes you made in T-Merge
or outside it.
> Stefan

Oto ot(ik) BREZINA
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-09-18 21:36:58 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.