views:

123

answers:

2

I'm looking for a diff/compare tool that shows differing lines from two text files, and gives me a space to comment on those files. Ideally this application would have three panes, pane one would be file A, pane two would file B and pane three would be a comment I can enter to on why the files are different.

We're going to be using this diff tool to compare test and production environments. Sometimes it'll be justifiable that the two files are different but we need to have a space to explain why. I'd rather not write those comments in the files themselves.

I've used TortosieMerge, WinDiff and Beyond Compare. I like beyond compare the most because it lets me see the whole file, just the differing lines or the differing lines in context.

Tools that sit inside Visual Studio or eclipse are fine too.

+2  A: 

It sounds to me like you might want to use a code review tool for this (even if you're not really performing code reviews). They record diffs in a database and allow comments on those diffs.

A couple free ones are:

  • CodeStriker - I've used this and it works pretty well, but required more tweaking and mucking around in Perl that I'd have liked (that was a while ago, though)
  • Review Board - never used this, but it sure looks nice. I'm trying to get it installed at my current place of work.
Michael Burr
While I was thinking more along the lines of a standalone desktop app, this does make sense. Can you recomend anything that would integrate with Team Foundation Server.
pnewhook
Yeah - these tools are geared toward collaboration so they're server based, but there's nothing that would prevent you from installing CodeStriker on your own machine with you being the sole user - but it's definitely not a simple 'click through' installation. But I did it, so it can't be too bad... And sorry - no TFS recommendation. I've only had limited experience with TFS.
Michael Burr
A: 

I am not sure if PilotEdit is what you are seeking for. But PilotEdit is very powerful in comparing files.

Dracoder