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

learn more… | top users | synonyms

0
votes
1answer
61 views

How can I get a diff-like comparison of two files without the “change” sections?

I have two files that I would like to compare in terms of additions and deletions only. For example, if I diff these two files: start old old old end and: start old old but now new new new end I ...
1
vote
0answers
87 views

Does Sibling Node Order Matter In Canonical XML? [closed]

When using $ xmllint --c14n one.xml > 1.xml $ xmllint --c14n two.xml > 2.xml $ diff 1.xml 2.xml Would it matter if the order of the sibling nodes were different? I.e. are these the same? (...
2
votes
1answer
1k views

Show git diff HEAD~1 of file not touched in recent commits

In Git, to see the differences with a previous commit I run this: git diff HEAD~1 To see the commits related with a single file I would run this: git log --oneline file But if I run the ...
9
votes
3answers
4k views

Using diff on a long one line file

I have a file that has only one line. Its size is about 20,000 bytes. The file has been modified, and I wanted to know where. I thought using diff, but it shows me the complete line, because it ...
0
votes
2answers
334 views

Find the different two Excel sheets when having identical row

I have two excel sheets with same column Names and Format. And it has one identical row(can use as Primary Key) id. I want to get the diff. table 1: id Name GPA ----+------+------- 1 | AA |...
3
votes
3answers
1k views

Using 'diff' command over ssh

If I have a folder with several files on my computer, and a copy of the same folder on a remote server, is it possible to run 'diff' through ssh so I can see the differences between my copy and the ...
0
votes
1answer
209 views

How do most sync programs monitor file changes? [closed]

Do sync programs like Dropbox typically track file changes by doing byte by byte comparisons, or using hashes, or using diff / keeping local commit logs like version control, or what?
1
vote
4answers
4k views

Difference between folders

How can I compare recursively 2 folders with same structure. With using diff or git diff from bash command line?
1
vote
1answer
76 views

How to patch something with diff output?

I want to apply the below changes to some code that someone has written and provided a diff output from. Is there a way given only the output below I can easily create a patch and apply it, or (as it'...
3
votes
1answer
175 views

Updating a modified Prestashop

I don't know if this is the proper forum for this; didn't really seem like a Stack Overflow question, so if I'm in the wrong here, do point me to the correct SE site. Anyway, I have a Prestashop 1.4....
2
votes
1answer
216 views

Directory diff with text file output

It appears I was unable to save the scripts I used for converting some Subversion repos to Mercurial ones, more specifically the filemaps. How can I get diffs between two directories (added/removed ...
2
votes
1answer
372 views

About regexp in emacs ediff-directories

I want to compare two directories which have similar hierarchy. With "M-x ediff-directories" within Emacs, I was prompted to input a regexp to constrain the name of files I want to compare. For ...
1
vote
1answer
149 views

Graphical comparison tool to use with svn on Mac OS 10.7

Is it possible to view "svn diff" output graphically on Mac OS? Most of the graphical diff programs allow you to view only one file per time. Which is very inconvenient when you use svn and have ...
3
votes
2answers
2k views

Comparing files for similarities

Is there a standard Linux tool that looks for similarities between two files? The diff tool works best comparing files that are mostly the same, and outputs where they differ. I'm looking for a tool ...
1
vote
1answer
331 views

How can I compare two files, from a website, on the command line?

I need to do the following: Basically, I want to be able to compare two text (or text-equivalent, i.e. not binary) files which are held on a website, e.g.: http://server01/home/compare/file1.RPGLE....
5
votes
2answers
1k views

Vimdiff and git all at once

I use vimdiff as my difftool with git. Let's say that I've changed twelve files. The problem is that sometimes I run git diff and around the fourth or fifth file I see something that I want to edit/...
3
votes
1answer
762 views

How to create Delta / Changed files from directories?

I'm trying to create a "changed files" package from one directory to another and need to find a Linux/Unix tool/utility that will be able to handle this. Example: Package_1.1/ (old) Package_1.2/ (...
0
votes
1answer
103 views

Diff between files in different directories

I have the follow directory structure ./goodboys/a.txt ./goodboys/b.txt ./badboys/a.txt.boy ./badboys/b.txt.boy I am using zsh. I want to diff all *.txt in goodboys with *.txt.boy in badboys. I am ...
2
votes
1answer
561 views

VIM: How to diff specific lines in two different files

How might one diff lines 2-4 in fileA and lines 8-10 in fileB? Also, is it possible to visually select the lines in each file instead of writing down the line numbers? Thanks!
0
votes
1answer
1k views

Compare content of directories in Linux

In Linux, if I have two directories, how I can see the differences of content in these directories? Now I use this command: diff <(ls -d dir1/*) <(ls -d dir2/*) Any other idea?
1
vote
1answer
3k views

Let diff create new files, but not remove existing files

Maybe I am missing something, but I'd like a diff between two directories to create files that don't exist, but not remove files that do. So, given something like: ./a/foo ./b/bar This command: ...
5
votes
3answers
1k views

View incremental diffs of my revisions to files using Dropbox

Sometimes I use a simple editor like Notepad++ to edit my webpages on Dropbox. Notepad++, not being an über-editor or IDE, does not track file changes for me. But Dropbox does!! Has anybody ...
0
votes
1answer
172 views

GVIM: diff against the saved file in Windows

Under Linux, I diff the currently open file against the saved file like so: :w !diff % - Is there any way to do this under Windows in GVIM? Thanks.
2
votes
2answers
252 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
2k 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
893 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
710 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
2k 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
265 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
1k 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
108 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
88 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 ...
4
votes
3answers
5k 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
198 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, ...
12
votes
4answers
10k 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 ...
3
votes
1answer
439 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 - ...
0
votes
1answer
55 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 ...
3
votes
1answer
1k 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
2answers
209 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 seeks ...
2
votes
2answers
2k 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
4k 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
164 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
1k 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, ...
3
votes
2answers
3k 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
8k 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
188 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
2k 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 ...
5
votes
4answers
4k 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...
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 ...