[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 10 Sep 2012 15:33:45 +0200

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.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-09-10 15:33:55 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.