Visual merge tool & the diff-cmd config

[Ray Johnson <Ra...@ingenio.com>]

 
Recently I asked a question about what Visual merge tools folks use on
Windows.  It's a deal blocker for our VSS users if they can't do
graphical merges!  :)  A couple of folks suggested TortoiseMerge which
I'm currently playing with.
 
Unfortunately, I'm completely stuck on how to get this to work with the
diff-cmd config.  Currently I have the config looking something like
this:
diff-cmd = C:\Program Files\TortoiseSVN\TortoiseMerge.exe

When I then attempt a diff (svn diff foo.cs) svn does indeed launch
TortoiseMerge.  However, it doesn't get the files associated with the
merge.  Instead it pops up a dialog asking me to select the files to
merge.  I also tried this with windiff.exe and can not get it to work
there either.

Perhaps I'm setting this wrong.  I looked in the book and didn't really
find any examples.  I also am having a hard time finding any
documentation that shows what svn is passing to the external program as
arguments.

In any case, I'm curious if anyone has some examples of how they got
this to work on Windows with TortoiseMerge of any other diff & diff3
program for that matter...

Ray

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Visual merge tool & the diff-cmd config

[Miki Tebeka <mi...@zoran.com>]

Hello Ray,

> Recently I asked a question about what Visual merge tools folks use on
> Windows.  It's a deal blocker for our VSS users if they can't do
> graphical merges!  :)  A couple of folks suggested TortoiseMerge which
> I'm currently playing with.
There is also GVim in diff mode (gvim -d) and KDiff3, both are free.

HTH.
--
-------------------------------------------------------------------------
Miki Tebeka <mi...@zoran.com>
http://www.cs.bgu.ac.il/~tebeka
The only difference between children and adults is the price of the toys.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Visual merge tool & the diff-cmd config

[Helge Jensen <je...@slog.dk>]

Ray Johnson wrote:


> Unfortunately, I'm completely stuck on how to get this to work with the
> diff-cmd config.  Currently I have the config looking something like
> this:
> diff-cmd = C:\Program Files\TortoiseSVN\TortoiseMerge.exe

You do know, that if you use TSVN, you can double-click the lines og the 
update/merge log. And get tortoise-merge run on that file? Especially 
usefull for conflicts :)

I prefer getting text-diffs (/usr/bin/diff) when using the command-line, 
and tmerge when using the win32-gui.

TortoiseMerge is not the coolest merge-program in the world (that's 
emacs+diff3, of course :) but it works really well for the "little 
things" conflicts that i usually (3-4 times in a month) get.

-- 
Helge

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org