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

Re: TortoiseMerge executed from commandline won't auto save to /Merged filename

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 27 Jun 2013 16:38:51 +0200

On Thu, Jun 27, 2013 at 11:30 AM, sin <sinys15_at_yandex.ru> wrote:

> use TortoiseMerge (version 1.8) from the commandline providing it with the
> nesc. parameters:
> /base:"$basefile" /theirs:"$branchtip" /mine:"$usertip"
> /merged:"$resultfile"
> All actual files uses as temp files, stored in the applicationdata\temp
> directory on a windows workstation.
> After show TortoiseMerge window I click "close the window" and the window
> is
> closing without SaveDialog for /merged:"$resultfile" and without save
> resultfile, regardless of there is a resultfile or not or resultfile is
> exists and it is empty or not.
> This small problem makes a lot of problems for us.
small problem? And you sent three posts? How many do you send for real

As for your "problem": that's by design. If you don't change anything, why
would it ask to save anything? Why would it ask to save (save what
exactly?) if you haven't changed anything but only *viewed* the conflict?


  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 2013-06-27 16:39:15 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.