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

RE: diff and merge tools

From: Roger Talkov <rtalkov_at_appworx.com>
Date: 2003-12-03 23:03:12 CET

I installed WinMerge and editied the subversion config file to specify
WinMerge as the diff-cmd, but when I try:

svn diff x.sh

WinMerge shows a listing of the files in the directory.
What is the correct config setup for WinMerge ?

I used the same setup as if using Cygwin diff:
[helpers]
diff-cmd = D:\Program Files\WinMerge\WinMerge.exe
diff3-cmd = D:\Program Files\WinMerge\WinMerge.exe
diff-has-program-arg = true
diff3-has-program-arg = true

>-----Original Message-----
>From: Fawad Halim [mailto:fawad@fawad.net]
>Sent: Wednesday, December 03, 2003 9:52 AM
>Cc: users@subversion.tigris.org
>Subject: Re: diff and merge tools
>
>
>On Windows, we use WinMerge (http://winmerge.sourceforge.net/), and on
>Linux kompare (inside kdesdk).
>
>-fawad
>
>Mike Mason wrote:
>
>> Kerim Borchaev wrote:
>>
>>> Hello!
>>>
>>> Now I'm pretty happy with command-line svn. But me and my coworkers
>>> have a VSS background - and we lack it's "visual" diff and merge tool.
>>> What tools svn-people use that help them to view differences between
>>> file
>>> revisions and effectively hand-merge(when auto-merge doesn't help)?
>>>
>>>
>>
>> I use the Perforce diff and merge tools, available in the main
>> Perforce download from http://perforce.com/perforce/downloads/ntx86.html
>>
>> The diff and merge tools are free for use without needing a Perforce
>> licence. It's the first thing I install when someone asks me to use
>> StarTeam...
>>
>> Cheers,
>> Mike.
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>>
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 3 23:07:29 2003

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