diff

library for doing diffs

I've been tasked with creating a tool that can diff and merge the configuration files for my company's product. The configurations are stored as either XML or URL-encoded strings. I'm looking for a library, preferably open source with a license compatible with commercial software, that can do these diffs. Our app is written in C++, so...

Is there a way to get a difference report on two Jet (.mdb) databases?

I have code that depends a relatively small MS Jet (created in Access) database. Our source control process is far from all that it could/should be (which is a problem that needs to be solved immediately) and we have ended up with two versions of the same database. The person who edited the "other" version is no longer around to give me ...

Comparing Mac's and Unix manuals?

How can I list differences between Mac's and Unix manuals? For example, between the following commands uniq guniq I tried the following unsuccessfully diff (man uniq) (man guniq) ...

Use a different diff command with CVS?

Is it possible to use a different diff program with CVS? I'd like to use something like meld to give me a side-by-side graphical view of the repository and my changes. It's out of my control to use a different CMS. What would be ideal is some undocumented command line argument that would work like this: cvs diff -prog /usr/bin/meld f...

Determining the start and end range of bytes changed in a file

I'm working on a little experimental utility to use within our company that indexes notes stored in our custom CRM software for full-text searching. These notes are stored in a Btrieve database (a file called NOTES.DAT). It's possible to connect to the database and retrieve the notes for indexing by using Pervasive's ADO.NET provider. Ho...

Subversion diff --summarize only shows old paths

If I do this: svn diff --summarize --old http.../svn/project/trunk --new http.../svn/project/branches/branch I get a list like this: D http.../svn/project/trunk/deletedFile A http.../svn/project/trunk/addedFile M http.../svn/project/trunk/modifiedFile It only shows the old paths. Is there a way to get the ne...

diff to html (diff2html) program

I'm looking for a "diff to html" program, which would generate a static html page from a given diff/patch file. I've googled for it of course, but apart from some scripts I've found there's no "real project" (e.g. no package in Debian/Ubuntu). Have I missed something? Can you recommend anything? ...

Is there a word document format that supports version diff comparisions?

I know this question has probably been asked already but I would really like to know of a program that will show line by line the differences between to word documents. Thus I need a word document format that supports this (.doc, .docx and .ods obviously don't). Are HTML and XML the only formats that come close to supporting this featur...

How to diff two versions of same object ?

I want to compare two objects of different versions and display their differences in UI. First I call a method to know if there is any difference between the two objects The method is: public bool AreEqual(object object1,object object2, Type comparisionType) If the above method returns true, I call the GetDifferences method to get t...

Comparison of bmp files?

I want to compare two bmp files. I thought of two approaches: to compare the header as well as the information header of the two files convert the bmp file to binary and then do the above comparison But, I don't know how to start and which will be a better approach. I would be glad if someone could please help me! ...

Free C# XML Diff library or class

Hi all. I’m looking for XML Diff class or library. There are my requirements: - open source :) - object model for output (*) - rather fast (for 4mb XML) I'm trying to use MS XML Diff and Patch Tools, but I wanna get a list of objects with differences of 2 XML files (instead HTML markup). UPD: Thanks for all of your responses. I ...

How can I use ediff (emacs diff) as a diff/merge tool in Windows ClearCase?

I'm forced to use ClearCase (Windows version) at work, and I want to use emacs ediff as a diff and merge tool. The problem with the ClearCase map file is that it requires .exe files - I've tried to specify a batch file calling ediff and it didn't work. I don't want to write a C/C++ program (it's been more than 10 years since I've coded ...

How to create an identical gzip of the same file?

I have a file, its contents are identical. It is passed into gzip and only the compressed form is stored. I'd like to be able to generate the zip again, and only update my copy should they differ. As it stands diffing tools (diff, xdelta, subversion) see the files as having changed. Premise, I'm storing a mysqldump of an important data...

diffing two databases

Is there a tool to find the difference between two databases. Both the schema and the actual data are pretty much the same, but not 100%. Do you know a tool that can help to succinctly describe the changes. ...

How do I diff 2 source trees with a difference threshold?

Hi, I have 2 source trees, one is very similar to the other (one is VC6 and one is VS2005). I need a program that can recursively diff the source trees and tell me which files are different. However I want to be able to define 'how different' the files are. So I want to be able to ignore all files that are less than 5% different. I'd a...

Binary diff tool?

I need a utility to diff two binary files. The files are large (6-50GB) Beyond Compare is my favorite diff tool, and I own it, but it cannot handle binary files over what can fit in the process's address space. HexDiff 3.0 seemed interesting, except the trial version doesn't do diff's. *rolls eyes* The tool should be free, since I'm ...

oracle diff: how to compare two tables?

Suppose I have two tables, t1 and t2 which are identical in layout but which may contain different data. What's the best way to diff these two tables? ...

Why does wdiff not work with named pipes

How come I can do this in bash: $ diff -u <(echo -e "line1\nline2") <(echo -e "line1\nline3") --- /dev/fd/63 2009-03-30 09:49:07.527272646 +0100 +++ /dev/fd/62 2009-03-30 09:49:07.527272646 +0100 @@ -1,2 +1,2 @@ line1 -line2 +line3 i.e. I can use named pipes / process substituion to get the diff of a small chunk of text. However wh...

Viewing unified diff with meld/vimdiff other tools

Hi, I've got a unified diff file (say my_diff.diff), containing comparison of several files from a project. What would be the best way to review all the code changes in a nice visual format, for example, using meld or vimdiff? I have figured out the way how to do it for a single diff file (ie. containing comparison of just two files)...

How does one extract a unified-diff style patch subset?

Every time I want to take a subset of a patch, I'm forced to write a script to only extract the indices that I want. e.g. I have a patch that applies to sub directories 'yay' and 'foo'. Is there a way to create a new patch or apply only a subset of a patch? i.e. create a new patch from the existing patch that only takes all indices t...