[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: Bas Schouten <Bas_at_sg-partners.nl>
Date: 2007-09-11 09:03:43 CEST

Stefan,

I'v located the problem!
I was still using the 1.4.4. version of TortoiseSVN because this version was installed in the default program files directory of Windows XP 64bit (C:\Program files (x86)\TortoiseSVN) while the new version was installed in c:\program files\TortoiseSVN

Even though I thought I unistalled the previous version, this must have gone wrong because of the deviation in install-directory (maybe a glitch in the uninstaller?).

Now I'v tested it with the new executables (making sure I was using 1.4.99) the merge is going perfectly!

Thanks for the support

-----Oorspronkelijk bericht-----
Van: Stefan Küng [mailto:tortoisesvn@gmail.com]
Verzonden: maandag 10 september 2007 18:03
Aan: users@tortoisesvn.tigris.org
Onderwerp: Re: TortoiseMerge executed from commandline won't auto save to /Merged filename

Bas Schouten wrote:
> I'v worked around the problem with a batchfile, that creates an empty
> resultfile if its not already there, so its not an immediate problem
> anymore.
>
> Stefan, the problem still exists in the lastest nightly x64 build
> (1.4.4.9706)
>
> I can reproduce it the following way.
>
> Create three text files in c:\temp
> v1.txt
> v2.txt
> v3.txt
>
> Each slightly different from the others
>
> the execute Merge from the command line with the following command:
> "C:\Program Files (x86)\TortoiseSVN\bin\TortoiseMerge.exe"
> /base:"c:\temp\v1.txt" /theirs:"c:\temp\v2.txt" /mine:"c:\temp\v3.txt"
> /merged:"c:\temp\merged.txt"
>
> It starts Merge, and shows the Merged.txt as a result file in the
> lower pane, with a (not found) behind it.
> Now click on save, or close the application ... it should (im my
> opinion) save the result file as c:\temp\merged.txt but it opens a
> SaveAs dialog asking me for a filename (which i already provided on
> the commandline).

Just tried again with the latest nightly build. It works as expected.
If you have modified the bottom pane, it will ask you if you want to save your changes before exiting, and clicking "yes" will save the file to the /merge:"" path even if that file doesn't exist.
If you click on save, it will save the file to the /merged:"" path without asking.

And if you check the code, it will also automatically create any intermediate folders which don't exist yet so it can save the file to the requested path.

The only reason it would ask for a path to save the file to is if it can't save the file to the path you've specified with the /merged:""
param (i.e., if the file exists but is readonly).

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
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Sep 11 09:17:01 2007

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