PDA

View Full Version : Fine widows Diff util


NuriumGames
11-19-2005, 01:30 AM
So I was going to syncronyze two versions of some code and when the diff util I'm using started got this message:

"You are using CSDiff permanently and we are happy for that. Now it is our turn to ask you one simple favor: SPREAD THE GOOD NEWS ! ! !"

Indeed it's a very nice diff program and has all you could expect from this kind of util for free (you can even turn off the nag screen). Multiple subdirectoriues, different views, ...

Well, if you ever need some diff util, check this out :)
http://www.componentsoftware.com/products/csdiff/

digriz
11-19-2005, 06:52 AM
And on a slightly different tack. I'd recommend a utility called 'Beyond Compare 2'...it's not a code diff utility. It's a folder and file difference utility.

I've been doing a lot of network code recently and this has proven invaluable.

It can be found at http://www.scootersoftware.com/

jankoM
11-19-2005, 10:32 AM
I couldn't survive 5 php-ing years without WinMerge http://winmerge.sourceforge.net/ . It is Open Source, very friendly and was one of the most active projects for quite some time on sourceforge (so it's not some abandonware).

Abscissa
11-19-2005, 11:00 AM
And on a slightly different tack. I'd recommend a utility called 'Beyond Compare 2'...it's not a code diff utility. It's a folder and file difference utility.

I've been doing a lot of network code recently and this has proven invaluable.

It can be found at http://www.scootersoftware.com/
I love Beyond Compare. I've been using it for awhile too.

chanon
11-19-2005, 10:13 PM
I couldn't survive 5 php-ing years without WinMerge http://winmerge.sourceforge.net/ . It is Open Source, very friendly and was one of the most active projects for quite some time on sourceforge (so it's not some abandonware).

I also use WinMerge all the time.

Larry Hastings
11-29-2005, 05:33 PM
What separates the men from the boys in diff tools is doing a three-way diff. None of the diff tools mentioned so far support three-way diffs.

I know of two tools for Windows that support three-way diffs: Merge for Windows (http://www.araxis.com/merge/), which is $269, and Guiffy SureMerge (www.guiffy.com), which is $99. (And written in Java, so it's actually cross-platform.) For those of you on non-Windows platforms, odds are good you can use Meld (http://meld.sourceforge.net/) or KDiff3 (http://kdiff3.sourceforge.net/).

Cheers,

Fabio
12-01-2005, 06:15 AM
So I was going to syncronyze two versions of some code and when the diff util I'm using started got this message:

"You are using CSDiff permanently and we are happy for that. Now it is our turn to ask you one simple favor: SPREAD THE GOOD NEWS ! ! !"

Indeed it's a very nice diff program and has all you could expect from this kind of util for free (you can even turn off the nag screen). Multiple subdirectoriues, different views, ...

Well, if you ever need some diff util, check this out :)
http://www.componentsoftware.com/products/csdiff/Cool, thanks for the info! :)