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

[TSVN] Problem with TortoiseProc /command:resolve

From: Mark Reynolds <scarab_at_tailwaggers.com>
Date: 2005-09-27 17:21:07 CEST

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"

then a dialog appears with the title "Resolve" and a popup message
dialog in front that says: "All files are already under version control.
There is nothing to add!"

If I execute this at a command prompt:

"C:\Program Files\TortoiseSVN\bin\TortoiseProc" /command:resolve
/path:"C:\wc\myrepos\myfile.txt" /noquestion

then a dialog appears with the title "SVN Resolve... Finished!". In the
Action column in red it says "Error" and in the Path column in red it
says "No error occurred."

In either case, after pressing OK the file remains conflicted.

-- Mark R

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Sep 27 17:26:20 2005

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