[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: 2007-09-08 10:15:24 CEST

Bas Schouten wrote:
> We use TortoiseMerge from the commandline (or actually from another
> VCS), providing it with the nesc. parameters:
>
> /base:"$basefile" /theirs:"$branchtip" /mine:"$usertip"
> /merged:"$resultfile"
>
> All actual files used are temp files, stored in the applicationdata\temp
> directory on a windows workstation.
> When we're done with the merge and save, TortoiseMerge asks for a
> resultfilename, even though i'v provided that already with the /Merged
> parameter. It does this because the provided resultfile with the /merged
> parameter does not exist.
>
> I think it should create the resultfile if it doenst exist, and not
> bother the used with this

This works in the latest nightly build.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sat Sep 8 10:12:08 2007

This is an archived mail posted to the TortoiseSVN Users mailing list.