diff - Command-line tool to display the differences between two files, or each corresponding file in two directories.
4
votes
1answer
43 views
Compare files and tell how similar they are
Is there a way to compare two file and give some kind of numeric indication of their similarity?
For example, if I have two files that differ by just one character (say, a character was deleted or ...
1
vote
0answers
44 views
Merge several files with maximum 1 line difference
Suppose I have the following files:
file0.c:
int b=NULL;
int a=NULL;
file1.c:
int b;
int a=NULL;
file2.c:
int b;
int a=NULL;
I am looking to merge the files file1 and file2 to generate the ...
3
votes
2answers
146 views
How to know if a text file is a subset of another
I am trying to find a way to predict if a text file is a subset of another..
For example:
foo
bar
is a subset of
foo
bar
pluto
While:
foo
pluto
and
foo
bar
are not one a subset of each ...
1
vote
3answers
89 views
Alternative to diff with progress for massive directory compare?
I just rsync-ed 2,000,000 files (3TB) from one RAID to another.
I want to make sure my data is intact.
rsync -c takes a really long time.
diff doesn't show me what it's doing.
Is there an ...
10
votes
2answers
252 views
Is there a Linux deep diff tool that also compares file attributes?
Is there a Linux tool like diff that will recursively compare files and directories, but with the addition of also comparing: extended attributes, acl's, se contexts?
2
votes
2answers
26 views
Diff dpkg files with local copies
Is there a way of diffing the dpkg files with the one that are actually installed? Or barring that a way to find ones that have been modified?
1
vote
1answer
52 views
Running 'diff 'command after the 'find' command
I'm running this code on shell
mv -f ~/sites/text1.txt ~/sites/text2.txt;find ~/sites/ -type f -exec sha1sum {} >> ~/sites/text.txt \;diff ~/sites/text1.txt ~/sites/text2.txt;
However every ...
2
votes
2answers
42 views
How to show names of files being compared?
I used diff --from-file to compare my Riak dev1 config to the three others.
diff --from-file ~/riak/dev/dev1/etc/app.config \
~/riak/dev/dev2/etc/app.config \
~/riak/dev/dev3/etc/app.config \
...
5
votes
3answers
520 views
How do you compare two folders and copy the difference to a third folder?
You've got three folders:
folder current, which contains your current files
folder old, which contains an older version of the same files
folder difference, which is just an empty folder
How do ...
2
votes
1answer
67 views
diff --git unknown option
when I try to run
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
I get unknown option (I have installed git via apt-get install git)
0
votes
1answer
29 views
rcs and graphical diff
I have a machine running Ubuntu 6.06. Source files under rcs (no git available).
I need to visually compoare older revs of files with the checked out version.
Until now I have moved the file and ...
2
votes
1answer
145 views
How to compare two tar archives (including file content, new/removed files, symlinks)?
I have two tar archives (compressed or not compressed), and I want to find all differences in the two archives. Both archives contain a complete file system (i.e. when unpacked, would generate ...
4
votes
1answer
85 views
Why does diff fail when invoked from a Makefile?
Narrow-down of a patch problem I am trying to troubleshoot:
Only two files, each with a size of 1 byte:
file a (containing 'a')
file b (containing 'b') and
Goal is to make and then apply a patch ...
0
votes
0answers
51 views
How to compare two rfs directories with `diff`?
I've two RFS (RFS = Root File System) directories, which I would like to compare to each other with diff. Both directories represent an RFS of some other system, and they may contain links. If those ...
2
votes
2answers
53 views
Hot to make diff check a symlink link itself?
In Linux one can use the command diff to check for differences of files. I use it to check for differences across two modules, both copied to /tmp.
However, both modules have symlinks, which might ...
1
vote
3answers
185 views
compare files line by line and create new one bash programming
I have two text files. File 2 has logs over 1,000,000. File 1 has IP addresses line by line. I want to read file 2 lines and search these lines in file 1, I mean:
file 1:
34.123.21.32
45.231.43.21
...
9
votes
5answers
262 views
Diff head of files
I have two files. One file, I suspect, is a subset of the other. Is there a way to diff the files to identify (in a succinct manner) where in the first file the second file fits?
3
votes
1answer
49 views
How to create a patch ignoring indentation differences in the code?
I'm trying to create patch a file using diff tool.But facing an issues.The way I am doing is below.
I've created one Directory named a and put original file in to it.
a/original_file.c
Now I have ...
3
votes
4answers
190 views
Can I get the opposite of `diff -q` — matching identical files without printing their contents
I have a number of files in a directory, and I want to check that they are all unique. For simplicity, let's say I have three files: foo.txt, bar.txt and baz.txt. If I run this loop, I will check them ...
2
votes
1answer
246 views
How to pipe diff into Kompare?
I want to quickly compare files in two different directories to see if the files are the same (same content). I want to see the results in Kompare (I'm on KDE - Kubuntu 12.04).
Here's my diff ...
1
vote
2answers
82 views
how to count number of differences in large streams quickly?
I want to count the number of differences (different bytes) in two large streams (devices/files). E.g. two hard disks, or one hard disk and /dev/zero.
The program(s) involved must be fast, as fast ...
1
vote
2answers
94 views
Understaning of diff output
I have file1.txt
this is the original text
line2
line3
line4
happy hacking !
and file2.txt
this is the original text
line2
line4
happy hacking !
GNU is not UNIX
if I do: ...
1
vote
1answer
107 views
RANCID like configuration differ for linux applications
I'm looking for a RANCID-like (http://www.shrubbery.net/rancid/) config management tool - the catch is that I want to manage config files for Linux applications like mysql, apache, memcache, varnish, ...
0
votes
1answer
24 views
Read files in Directory and take diff
I have two directories named comp1 and comp2 and both have files named file1 and file2.
I need a bash script which read file1 from both the directories and take diff of each file and redirect to some ...
2
votes
1answer
155 views
How can I see moved lines in a file comparison with vimdiff / diff?
Moved lines are frequently annotated as deletes and adds but they can be shown as moved-from and moved-to instead.
Like in this screenshot of Notepad++.
2
votes
1answer
120 views
Getting diff (or git diff) to show inserted hunks properly
Let's say I have two files. The first one has the contents:
line 1
foo
line 2
line 1
bar
line 2
And the second one has a new section inserted in the middle, so it looks like this:
line 1
foo
...
0
votes
3answers
48 views
how to compare total file
Suppose i have 2 config files such as:
file 1:
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
virtual_gid_maps = static:5000
File 2:
...
6
votes
2answers
507 views
Is there a condensed side-by-side diff format?
I have two log files with thousands of lines. After pre-processing, only some lines differ. These remaining lines are either real differences, or shuffled groups of lines.
Unified diffs allow me to ...
6
votes
1answer
379 views
Is there bdiff (1) in Linux?
There is bdiff(1) command in Solaris, which allow you to diff(1) files with size bigger than your RAM size (http://docs.oracle.com/cd/E19683-01/806-7612/files-23/index.html).
Is there something like ...
2
votes
1answer
64 views
How-to diff distributions?
I am using a Raspberry Pi.
There seem to be all kinds of linux distributions, all in .img Format that I use Win32DiskImager for to burn to SD-card.
How do I find out, which files were changed(some ...
1
vote
2answers
742 views
How do I pipe colored diff output to less?
I've been using git diff, which produces colored output. However, I now find I need to use ordinary diff for something, and it's producing a lot of output that is hard to read because of the lack of ...
1
vote
2answers
102 views
What does -u of diff really do?
Looks like -u can take an extra number argument, but I don't quiet get the manual,
It says,
-u, -U NUM, --unified[=NUM]
output NUM (default 3) lines of unified context
Someone name an ...
2
votes
3answers
250 views
Diff 2 files ignoring strings between @ and [
I am comparing two files. I am trying to ignore the alphanumeric characters after @ and before [ . A line looks like
model.Field@d6b0d6b[fieldName
4
votes
2answers
442 views
Get diff changes between original files installed with apt and current files
I installed php5-fpm package using apt; then I made some changes to the PHP configuration files.
Now I would get the diffs between the original files versions (the ones of the package installed) and ...
2
votes
2answers
116 views
Live diff-mode editing in vim
I want a live view of diffs while I am editing a file. vimdiff is able to do something I want, like highlighting the differences between two files.
However there are two drawbacks of vimdiff that ...
1
vote
1answer
107 views
Create a recursive diff directory. Copy reference and diff. Recreate original directory
I have several directories/web site resources, each has total size of several gigabytes. They are more than 90% the same. Sometimes only a few files are modified.
I need to download these files for ...
1
vote
1answer
62 views
Interactive backup tool
I am looking for a backup (or diff) tool where I can select interactively which file I want to copy towards my external hard-disk.
Let me explain with further details: I have two computers and an ...
6
votes
2answers
416 views
Same file, different filename due to encoding problem?
I was about to diff a backup from it's source to manually verify that the data is correct. Some chars, like åäö, is not shown correctly on the original data but as the clients (over samba) interpret ...
1
vote
2answers
91 views
How can I load the right hand pane of vim with a new file in linux?
I want to compare two files(say A and B) side by side(vertically) in in Vim. I open one of those two files(say A) and as per this answer in this site issue a Ctrl+w v . Now both the panels are showing ...
2
votes
0answers
123 views
Using Unison with colordiff
I want Unison to show the diffs with colordiff.
I’ve got diff = colordiff -u CURRENT2 CURRENT1 | less -R in my config file but it seems like Unison pipes the output to plain less nonetheless, so I ...
1
vote
2answers
91 views
Reduce redundant logfile
I often have longer redundant log files, redundant in the sense that blocks of text repeat with minor changes. The length of the files makes it difficult to spot the actual information. I had the idea ...
3
votes
6answers
1k views
how to use patch and diff to merge two files
I have read about diff and patch but I can't figure out how to apply what I need.
I guess its pretty simple, so to show my problem take these two files:
a.xml
<resources>
<color ...
2
votes
2answers
107 views
Using Diff with -y to get side-by-side output
I am trying to use diff with -y to get side-by-side output, but my output gets messed up after about 18 lines. Here is an example, any clue why? (Check from *.java_pool_size=134217728) :
...
2
votes
2answers
67 views
How can I show the number of positions lines have moved in diff output?
top1
1,facebook.com
2,google.com
3,youtube.com
4,yahoo.com
5,wikipedia.org
6,baidu.com
7,live.com
8,amazon.com
9,qq.com
10,twitter.com
top2
1,facebook.com
2,google.com
3,youtube.com
4,yahoo.com
...
2
votes
1answer
221 views
Compare all text files in a directory, and sort by similarity
In Unix, is there any way to compare every text file in a directory to every other text file in the directory, and then sort each pair of files by similarity (using the diff utility)? There are ...
2
votes
2answers
56 views
Keep patch in sync with changing source
Is there any standard option to create 'patch' P that works on file F in such way that it will keep working correctly when file F changes into F'.
So I will either have some mechanism that will ...
1
vote
2answers
840 views
diff binary files of different sizes?
Is there a neat way to see the difference between two binary files? They are mostly the same, but some bytes are changed, and one of the files has sequences inserted in some places.
Diffing the ...
2
votes
4answers
442 views
Check whether two directories and their subdirectories are the same
With diff -r I can do this task, however it takes so long because diff checks file's content.
I want something that determine that two files are the same regarding of their size, last modified, etc. ...
7
votes
7answers
317 views
Review changes in .tex files
I have two files paper.tex and paper_suggested_changes.tex the latter is a modified version of the former with corrections.
I need to go through the two files and choose which changes to accept or ...
3
votes
3answers
264 views
How to diff two folders by inodes
I'm currently using a script to backup files on my computer.
In a nutshell, it works like this:
rsync --link-dest=$FOLDER/current $SOURCE $DESTINATION
However, I think that my script may be ...
