[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:04:46 +0200

On 2012-09-12 14:11, Stefan Küng wrote:
> On 12.09.2012 12:00, Oto BREZINA wrote:
>> On 2012-09-10 16:36, Stefan Küng wrote:
>>> On 10.09.2012 16:08, Oto BREZINA wrote:
>>>>> When resolving a conflicted file (svn status indicates a conflict), then
>>>>> the flag is passed to TMerge.
>>>>> TMerge then asks to save the changes (even if there were no changes
>>>>> made) to ensure that situations where TMerge can do the merge without a
>>>>> conflict, that merge is saved.
>>>> Sorry for stupid, question I'll try that on Wednesdays soonest, so it is
>>>> easier to ask - until I forgot :)
>>>> Thing is there are two ways to save file in T-Merge. 1. Save 2. Mark as
>>>> resolved. I miss the second option in closing dialog when closing
>>>> T-Merge (from conflict resolve mode) sometimes.
>>>> Is this what happen now? In source codes I have seen only save what
>>>> usually means save and "resolve later manualy" ...
>>>> From this point it seems to be there some "missconception" but I'll
>>>> know once really tested.
>> 4. You are asked about not resolved conflict. Select save.
>> Now file is saved(I guess), but is not resolved! Thus when reopen using
>> Edit conflict same state as before apears.
> Of course: you didn't resolve the conflict at all!
> If there's a conflict shown in TMerge, you *must* resolve that conflict
> manually.
> Only if there's no conflict shown in TMerge but SVN still shows a
> conflict, *then* you only have to save.
Using Resolve from ribbon I'm able to postpone resolving some part of
file and mark file as resolved anyway ... why not from closing dialog?
>> My sugestion is to add "Resolve" in step 3. This will make file resolved ...
> There's a button "resolve conflict".
That button is not in dialog when trying to close a file. On other hand
there is Save in ribbon too ...


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

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