[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: Ron Wilson <ronw.mrmx_at_gmail.com>
Date: 2007-09-07 19:20:20 CEST

So if you create an empty "$resultfile" it works?

You could create a TMERGE.BAT script with:
     TortoiseMerge /base:"%1" /theirs:"%2" /mine:"%3" /merged:"%4"

Then invoke the bat file:
     TMERGE.BAT "$basefile" "$branchtip" "$usertip" "$resultfile"

On 9/7/07, Bas Schouten <Bas@sg-partners.nl> 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

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Sep 7 19:17:11 2007

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