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

Re: TortoiseProc command:merge parameters

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 11 Sep 2010 10:20:30 +0200

On 10.09.2010 16:56, Peter Hermannstädter wrote:
> Hi everybody,
>
> for TortoiseProc and the merge command, there are the parameters /path, /fromurl and /tourl given in the Appendix D of the manual. Still, I'm struggling to have the tree merge wizard being opened with the respective fields filled in.
>
> I'm working with a local repository on a network share and a working copy on my harddisk. I want to prepare a merge of two trees (a current and an earlier vendor release) and apply the changes to my working copy:
> C:\> TortoiseProc.exe /path:C:\myWCs\thisProject\bin /command:merge
> /fromurl:file://sharename/path/to/repo/vendor/bin/current /tourl:file://sharename/path/to/repo/vendor/bin/tag1
>
> Using this exact command, I end up in the Merge revision range dialog of the wizard and not in the Merge two trees dialog. Am I getting something wrong about the commandline parameters? What do I need to change? Or is this a bug or a deprecated command?
> The /path and /fromurl parameters are correctly put into the boxes of the wizard, but I guess the /tourl parameter is totally ignored, which leads to opening the Merge revision dialog...
>
> By the way: I don't want to use the commandline client. I want to batch the preparation of the merge wizard such that another user can use the GUI to conduct and observe a number of merges of vendor release changeset into a working copy.

You found a small bug in TSVN :)

You have to pass /fromurl2:"somedummyurl" to make the merge wizard use
the tree merging. The /fromurl2 isn't used, but you have to pass a
string there too to make it work.

I'll fix this soon.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2657767
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-11 10:20:58 CEST

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