diff is a shell command to find differences between two files. It is common on all *nix based systems

learn more… | top users | synonyms

2
votes
2answers
191 views

Comparing 2 (or 3 Files If Possible) “Line By Line”

I want to find out the differences of 2 (or 3 files if possible) line by line. Diff utils can do this, however it gives inaccurate results. Because, 2 files have exact number of lines which is "134". ...
1
vote
2answers
1k views

Diff and ignore lines missing in one file

I want to diff two files and ignore lines that are present in one file but missing in the other. For example File1: foo bar baz bat File2: foo ball bat I'm currently running the following diff ...
4
votes
3answers
697 views

Diff 2 files while ignoring parts of lines

I would like to diff a file system. Currently my bash script prints out the file system recursively into a file (ls -l -R) and diffs it with an expected output. An example for a line in this file ...
0
votes
2answers
394 views

show differences between file and file in (compressed) tar archive

Say I have unpacked a gz-compressed tar file, and do not remember what changes I made to the unpacked files, or I archived a folder a while ago and want to know what has changed to the files since. I ...
2
votes
4answers
788 views

How can I compare the contents of .pdf files, excluding filenames from comparison?

I usually use WinMerge to view the differences between files, but in this case it doesn't help. The files I'm comparing are known to have different filenames, which is creating false positives when 2 ...
2
votes
3answers
247 views

A tool to compare 2 folders and store the difference?

Does anybody knows a way to compare 2 versions of a directory to create a 3rd one with the difference of both? I need it to make incremental updates of my software. Thx
4
votes
3answers
554 views

Is there any graphical display tool for diff output?

I would like to post-process diff output and then pass the results to a graphical viewer, such as kdiff3 or xxdiff. If possible, I would like to be able to highlight in-line differences using ...
5
votes
1answer
92 views

How to determine segments of footage held in common between different video files?

Context: Say I have two video files--rips from a DVD or DV tape. They are both MKV or AVI format, some standard container or other, but were ripped separately, with different encoders, different ...
0
votes
2answers
81 views

Running the output of script, and checking for consistency

Given a file that was output by script, is there a way to run all of those commands in order, and then check to see if the output matches what was in the script file? I assume that diff can be used ...
3
votes
3answers
2k views

Diff in bash script?

I've been toying around with makefiles and bash scripts and I'm interested in this: Is it possible to get a boolean value from a diff(or something similar) so that I can use it in a bash script to ...
1
vote
1answer
185 views

Check for duplicate files in two collections, ignoring duplicates within A

I have four similar large collections of website files. They are archived copies of a similar directory tree from different times in the past. I want to merge them all to the most recent collection, ...
7
votes
3answers
4k views

Prevent diff from checking for newline at end of file

I have two big trees, which I want to compare. Some of the files in the tree differ just because one has newline at the end, and the other file lacks this newline. I want to ignore this fact. I have ...
2
votes
1answer
306 views

Binary diff tool which would work the same way as diff(1) tool

Do you know Unix/Linux diff(1) tool works? It shows which lines were added and removed between 2 text files, and shows it in the human-readable form. I need the same kind of tool for binary files - ...
2
votes
2answers
854 views

List differences between remote folder (sftp) and local one

I wish to find a windows program (preferably with GUI) that will compare recursively a remote folder (SFTP) and a local one. I would like it to list all the files and folders that are different, ...
0
votes
1answer
53 views

Diffing a PHP class file

I'm looking for a program that can diff/merge code files, and be aware of method names. Currently, I'm diffing two files in WinMerge - one is a class called Core_Search, the other is a class called ...
2
votes
1answer
638 views

GUI Software To Compare Two Files, Get “Clean” Export of Differences?

Is there a way to do a "clean" export of the differences between files? Not a diff, or even a formatted report... just a clean .CSV/.XLS/etc export. This is for people that are non-technical; we have ...
1
vote
1answer
213 views

GNU/Linux substitute for the Windows-based TreeComp tool

I miss the TreeComp tool from Windows on Linux. Does anybody know about a similar tool for Linux? I've tried Unison & Unison-gtk (slow and cumbersome), diff (various), meld, mc, rsync (immensely ...
0
votes
2answers
196 views

Can any of the diff/grep utilities do a “file grep”? [duplicate]

Possible Duplicate: Duplicate file finder ... to continue on the title, basically what I want is for me to give him the file, and the program goes through the whole project directory and ...
2
votes
2answers
1k views

How to open local files for diffing in Kompare from command line?

When I use meld to obtain visual diff, I can merely run this from the command line: $ meld file1.txt file2.txt ... and meld starts, loads each file in a separate subwindow, and shows the ...
5
votes
1answer
2k views

How do you get Eclipse's built-in diff tool to ignore differences in whitespace?

I'm working on a large codebase that's been touched by many hands. As I work through bugs, I've been converting the source to be more readable which involves a lot of minor changes in indentation ...
0
votes
2answers
160 views

An Application to describe .patch files

Do you know any application that be able to describe .patch files? I mean an application that be able to get .patch file & give me a human readable of the changes it make on files so I'll be able ...
0
votes
2answers
678 views

Tool to create a patch that modifies/adds files within a directory structure

I have a set of files that need a set of changes applied to them. In this scenario I have a Java Application Server (distributed via a zip file) that I need to apply a set of known configurations to, ...
1
vote
2answers
2k views

Is there a tool to measure file difference percentage?

I am looking to compare two text files. Normally, I can just use diff to compare the two files to see the differences. This is great, except that I am more concerned with the percentage difference of ...
7
votes
5answers
5k views

How can I compare two directories, one being a remote directory?

I want to compare two directories, one is local and the other is on another machine. How can I do that? Can I do it with diff?
2
votes
1answer
164 views

Jump to file/line of current patch hunk in vim

If I'm viewing a multi-file diff in vim - for example the one produced by running :VCSDiff in a netrw buffer - and I position my cursor over a particular hunk, is there a way to jump to the affected ...
3
votes
1answer
423 views

Sorting XML files so that differences can then be found

I need to compare two XML files, each of which is about 13,000 lines long. Sadly the code that generates these files doesn't generate the data in the same order each time (the data comes from a ...
3
votes
4answers
2k views

Is there a diff utility that allows you to exclude columns?

For example, I have a text file, each line is a long string. I want to exclude 2 "segments" of this string, say columns 1-7 and 20-22. So the bottom 2 lines below would be a match: ...
0
votes
5answers
2k views

Diffing tools for Mac OSX [closed]

Are there tools for diffing without subversion? Right now I am just writing code on my local but the ability to diff versions would be nice...
0
votes
1answer
132 views

Windows: Which diff tools doing directory diff from command line to file showing diffs only?

I'm looking for diff tools that: Run on Windows Can be kicked off from a batch file Can dump results to a file (silent mode) Show only diffs in the file What should I use?
2
votes
1answer
2k views

How can I gather the diff between two folders (only the diff) into a different location

Basically, what I want to do is find the difference between two music folders (structure example below), and copy that diff to a different location. Structure of content for both folders: Album ...
8
votes
1answer
3k views

WinMerge and Diffmerge

I prefer Winmerge to Diffmerge. But the one thing I envy is diffmerge's folder diff feature. Diffmerge shows, for complecate folders and subfolders, only different files(not folders). Winmerge shows ...
2
votes
0answers
743 views

Binary Visual Diff Tool for MacOS X

This might already be answered, but I did not find an answer that really matched my needs. I'm looking for a visual diff tool that can diff binary files. It was also OK if it was integrated into a ...
1
vote
3answers
915 views

Confirm that two filesystems are identical, ignoring special files

/media/A and /media/B should be identical, but I want to confirm before deleting one. Duplicate file finders don't work, because they'll find two copies of the same file within B, for instance. I ...
1
vote
0answers
149 views

StatSVN generated XML is slightly out of date

There are no StatSVN questions on superuser, but why not start? ;-) Here's my problem... I generate a log from subversion with: svn log -v --xml > log.xml The latest revision that shows up in ...
7
votes
3answers
4k views

Binary diff/patch for large files on linux?

I've got two partition images (A and B) and want to use them to create a patch that I can apply on A on another computer in order to get the new B image without flooding the network. I have the ...
1
vote
1answer
124 views

How do I diff an RSS feed against last time it was run?

I have a feed - for example 2011 Patents of ultraviolet screens If I run this next week, I would like to see if there had been an update since last time I looked - are there any feed readers that ...
0
votes
1answer
81 views

Compare Guitar Pro files

I am looking for a tool that can diff/compare Guitar Pro (5) files. Which of these file types should/could I use to compare tablatures? GP5 exports these file types: MIDI ASCII MusicXML GP5 These ...
2
votes
1answer
542 views

How to configure BeyondCompare to mark newline differences as unimportant?

Newline additions in the middle of a line in BeyondCompare are marked as important. I want them to become unimportant. How to do that? Example: A: <img src="a.gif"/> B: <img ...
5
votes
2answers
311 views

“diff” terabyte files

Are there any tools that allow to "diff" text files of terabyte size?
7
votes
1answer
4k views

How can I diff two network dumps from tcpdump or Wireshark?

I'm having a problem with one of our customers' embedded computers. They seem to discard some network packets which they should not. I can capture the TCP communication from a managed switch outside ...
6
votes
3answers
7k views

GUI tool for applying patch files for windows

There any number of good GUI diff-tools for windows (I use Araxis Merge, and kDiff3), but none of them (that I can find) will apply a patch file. I would expect it to work like this: I open a base ...
8
votes
3answers
1k views

How to ignore whitespace in Kaleidoscope (diff tool)?

In Kaleidoscope, how do I configure it to ignore whitespaces?
0
votes
0answers
185 views

How to diff two mails in outlook

I know a guy who is always re-sending me (rather long) emails with little changes. (i.e. a changed name or date) Is there an easy way (preferrably an addin in outlook) to visual diff (visual like ...
0
votes
1answer
71 views

Recommend a diff tool to show and explain some changes in a document

Now I'm in process of contract negotiation with a private company. They sending me the contract, I'm making some changes and then sending back to them for verification. Now they asking me to explain ...
0
votes
1answer
141 views

File comparison, one-to-many

I need a program that allows comparing one text file to many others without having to open each one manually. This is how it would work: 1) select the file which all others will be compare with 2) ...
3
votes
1answer
150 views

How to scroll the diff buffer easily in Emacs while point is on the minibuffer

In Emacs, after a lot of editing, I press C-x s (save-some-buffers), then Emacs asks "Save file ...? (y,n,.... d ...)" for each file, I sometimes answer d (diff) to see the changes, but then it's not ...
0
votes
1answer
102 views

Ungroup diff's output

I've got two files, and output of diff looks like this: 33428,33429c33428,33429 < lucid-security|main|icedtea-6-jre-cacao|6b20-1.9.2-0ubuntu1~10.04.1 < ...
4
votes
1answer
5k views

Can I use an replace internal diff in Total Commander with an external diff program?

Since I don't really like Total Commander's internal diff 'Compare Contents' used in Compare by content and Synchronize Dirs -> Compare left & right I want to use something else like Winmerge or ...
0
votes
1answer
139 views

svn diff software that simply downloads changesets

Does anyone know any simple software (preferably without installation) that allows to download changesets of specified revisions and save them as "changesetX.diff/.patch"? For some reason Windows ...
0
votes
1answer
225 views

Howto make a diff of a bios or backup/ restore all bios settings

I'm using an Dell M90 Precision Laptop which has a NVidia Quadro FX 2500M graphics card and is running Windows XP. Laptop has been running fine - but a few weeks ago screen went 'white' - restarted ...