[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: Mon, 10 Sep 2012 16:08:23 +0200

On 2012-09-10 15:33, Stefan Küng wrote:
> On 09.09.2012 21:08, Oto BREZINA wrote:
>> On 2012-09-09 14:15, tortoisesvn_at_googlecode.com wrote:
>>> Revision: 23280
>>> Author: tortoisesvn
>>> Date: Sun Sep 9 05:14:17 2012
>>> Log: When resolving a conflict, make TMerge ask for saving
>>> modifications on close even if there are no modifications.
>>> * new command line parameter /saverequired to force the 'save
>>> modifications' dialog on exit.
>>> * pass /saverequired to TMerge for situations where a conflict needs to be
>>> resolved
>>> (Closes issue #411) : Ask for save when resolving conflicts
>> Is this actually only saving file or also resolve it ?
> I don't understand your question.
> 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.

> Stefan

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