I'm trying to figure out how to use the command line switches for
tortoiseproc to cause tortoisemerge to open up and show me my working
copy modifications to a file automatically, so I can run it as an
external tool from within my code editor. I use editplus for most of my
php coding needs, and it would be useful to be able to hit ctrl-3 and
immediately see my modifications to the current file. Editplus calls
them "user tools", most other editors have similar capabilities.
I played around with tortoiseproc.exe /command:showcompare and got this
to almost work:
"c:\Program Files\TortoiseSVN\bin\TortoiseProc.exe" /command:showcompare
/url1:d:\temp\testsvn\blahnewfile.cs /revision1:BASE
/url2:d:\temp\testsvn\blahnewfile.cs /revision2:
d:\temp\testsvn\blahnewfile.cs is a file with local modifications, but
it just shows me the diff between the base and base revisions, so no
changes. Is there a way to specify "working copy version" for
/revision2, similar to how BASE can be used?
I'm still on tortoise 1.6.16 btw.
Also I did get it working with the following batch file, but it requires
a command line svn client. You might need to change %ProgramW6432% to
either %ProgramFiles% or %ProgramFiles(x86)% depending on whether your
windows and/or tortoise is 64 bit or 32 bit. Or just hard code it :)
-------------------------------------------------------
@echo off
rem strip path to get file name
SET B="%TEMP%\%~nx1_base"
SET C="%TEMP%\%~nx1_current"
rem delete old copies if they exist
if exist %B% del %B%
if exist %C% del %C%
rem export base and working copies of the file
svn export -rBASE %1 %B%
svn export %1 %C%
rem run tortoisemerge
"%ProgramW6432%\TortoiseSVN\bin\TortoiseMerge.exe" /base:%B% /mine:%C%
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2925182
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-21 21:16:51 CET