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

Re: [TSVN] Problem with TortoiseProc /command:resolve

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-09-27 18:49:12 CEST

Mark Reynolds wrote:
> TortoiseProc /command:resolve no longer seems to work for me, as of at
> least 1.2.2. I also tried 1.2.4.
>
> Let's say I have a file in my working copy at C:\wc\myrepos\myfile.txt
> that is conflicted.
>
> If I execute this at a command prompt:
>
> "C:\Program Files\TortoiseSVN\bin\TortoiseProc" /command:resolve
> /path:"C:\wc\myrepos\myfile.txt"

You must add /notempfile if you don't specify a path to a tempfile
containing the paths to resolve!

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Sep 27 18:52:12 2005

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