[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: Fri, 28 Jun 2013 21:46:14 +0200

On 28.06.2013 20:50, sin wrote:
> D:\MyProgram\Win32\Debug\TortoiseMerge64.exe
> /base:"C:\Users\User1\AppData\Local\Temp\ADF8582D3288409CBBBDA24E2FD36D0B.tmp"
> /basename:"package SCOTT.EMPLOYEE"
> /theirs:"C:\Users\User1\AppData\Local\Temp\7B9BD25AB2E1471E8142C1FA93F44FDF.tmp"
> /theirsname:"package SCOTT.EMPLOYEE"
> /mine:"C:\Users\User1\AppData\Local\Temp\8B5C45E592034551A468868A83B4CE26.tmp"
> /minename:"package SCOTT.EMPLOYEE"
> /merged:"C:\Users\User1\AppData\Local\Temp\E42A1082D47E4E9EA27A317B892C104D.tmp"
> /mergedname:"package SCOTT.EMPLOYEE" /saverequired

works fine for me: it asks me to save when I exit TMerge, and when I
click on "save", the file is saved and TMerge exits. I don't have to
close it separately. Only if I click on "Cancel", then the file is not
saved and TMerge does not exit.


   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-28 21:46:21 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.