diff

Looking for a Visual Studio 2008 integrated diff that I can control from code

I'm working on a Visual Studio 2008 Add-in that shows files from SharePoint. It is possible to edit file in SharePint from within Visual Studio, and I would like to give a view of the difference between the current document and the version saved in ShaerPoint and the last published version in SharePoint. In the past there was Super Di...

Is there anyway to save a patch/diff file in Araxis Merge?

I am merging some code and would like to save one diff to compare against another diff. (I'm in the dreaded diff-the-diff's scenario). Anywho, the normal way I would do this would be to save to patch files and compare them to make sure the correct changes were applied. Is there anyway to get Araxis to generate a patch file for a diff I'...

Undoing diff put when copying lines between vimdiff windows

If, at a command prompt, I run vimdiff file1 file2 I get a vim instance that has two files open side-by-side. Let's suppose that the text in the files looks like this (file1 is on the left, file2 on the right): ╔═══════╤═══════╗ ║foo │-------║ ║bar │bar ║ ║grue │-------║ ║~ │~ ║ ║~ │~ ║ ╚═══════╧═══════...

Need a Java and Javascript diff tool written in Java

We need an accurate diff utility for Java and Javascript files, written in Java. It should be invokable from within an Eclipse (version 3.2 or 3.3) application. Preferably we need the Java source code for this utility also. The utility should be able to compare two files (old and new, say) and determine the following accurately: Numbe...

Eclipse Abstract Syntax Tree Diff

Given the following code in Eclipse: import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.ASTParser; import org.eclipse.jdt.core.dom.CompilationUnit; public class Question { public static void main(String[] args) { String source = "class Bob {}"; ASTParser parser = ASTParser.newParser(AST.JLS3); ...

Diff Ignoring GUIDS

When using Diff, how would one go about ignoring line differences that only diff on GUID's? Something along the lines of: diff -I "^.*[a-zA-Z0-9]{8}\-[a-zA-Z0-9]{4}\-[a-zA-Z0-9]{5}\-[a-zA-Z0-9]{5}\-[a-zA-Z0-9]{12}.*$" Where obviously the above doesn't work, but just to get an idea of what is needed. ...

Diff without files

Is it possible to use the "diff" tool without having physical files? Something like this: diff "hello" "hell" ...

Diff tool which generates documentation?

I have tried Beyond Compare, and it seems to be a good tool. But I haven't found a way to export an overview of the differences. The format of it should be one that most people can reader. Doc, Rtf, Pdf, Html... What I need is to display the differences of two folder. And it would be enough to display which files has been changed. But ...

Getting svn diff to show C++ function during commit

Whenever I do a commit cycle in svn, I examine the diff when writing my comments. I thought it would be really nice to show the actual function that I made the modifications in when showing the diff. I checked out this page, which mentioned that the -p option will show the C function that the change is in. When I tried using the -p ...

Mercurial diff: ignore trailing whitespace?

I am in the distinctly unfortunate circumstance of working in an environment which worries little of the deep evil known as "trailing whitespace"... But, alas, the enlightened Mercurial persists in warning me, by means of red highlights in diffs, that code I will be checking in contains this unholy thing. So, is there any way to tell Me...

Can diff be beaten at its own game?

I'm looking for the appropriate algorithm to use to compare two files. I think I can do better than diff due to some added constraints. What I have are two text files each containing a list of files. They are snapshots of all the files on a system taken at two different times. I want to figure out which files have been added or deleted ...

Method name from line number

Given a line number of a particular class source code (Java/C#) - is there an easy way to get the name of the method it falls within? (If it falls within one) (Presumably using an Abstract Syntax Tree) (This would be useful in limiting the output of checkstyle to just the method touched). I'm assuming you'd have to use an Abstract Syn...

Image diff viewer SVN

We use Tortoise SVN for accessing our SVN server. I was wondering if anyone knew of a image diff viewer that would show two revisions of the image side by side to see any any changes. Similar to the TortoiseMerge that's included with it by default, only for image files. ...

DIFF utility works for 2 files. How to compare more than 2 files at a time?

So the utility Diff works just like I want for 2 files, but I have a project that requires comparisons with more than 2 files at a time, maybe up to 10 at a time. This requires having all those files side by side to each other as well. My research has not really turned up anything, vimdiff seems to be the best so far with the ability to ...

Beyond Compare 3.0 and XML Tidy, but save Original Format

Hi, I am using Beyond Compare 3.0 and using the XML tidy and XML tidied with sorted attributes plugins. Its great and while I would like it to show me the "tidied" XML, Once I resolve me merge, I would like to save it back with the original formatting (not the tidied format). Is there anyway of doing this? For example, if I have these t...

Order of svn diff revision range

Hi, I'm trying to compose a list of changed/added files in a svn repository, for use with phing, using the following command. svn diff --no-diff-deleted --summarize -r 50:HEAD path/to/workingcopy When I reverse the revision range (-r switch), like so: svn diff --no-diff-deleted --summarize -r HEAD:50 path/to/workingcopy .. I get di...

Diff two tabs in Vim

Scenario: I have opened Vim and pasted some text. I open a second tab with :tabe and paste some other text in there. Goal: I would like a third tab with a output equivalent to writing both texts to files and opening them with vimdiff. Currently I the close I can find is "diff the current buffer against a file", but not diffing two open...

Diff tool that allows saving the compare markup

Is there a diff tool that allows saving of the compare markup? To clarify, I would like to save the actual comparison of the two files that shows the differences to send to someone for review. EDIT Lots of good answers here. In my case I already had a copy of Beyond Compare but didn't see the option. Thanks to John Saunders for poin...

Can I use `diff -r` to just tell me the files that are in one of the trees that have changed in the other?

I want to generate a summary of the files that are in one tree that are also in the other, that have been modified in the second. The use case is this: I have a product distribution, which contains web content files. Those files are then imported into a client-specific project, and may be modified from there. I now want to see all th...

What are some Simple/Good ways to eventually merge two directories of source?

I have a source directory that includes a mix of different languages and files. Probably 100+ total files. I want to 'fork' that code and create a completely different version of the source. At this point, I will have version-1 of the code and version-2 of the code. I will not make that much development on version-1. I want to chang...