diff - Command-line tool to display the differences between two files, or each corresponding file in two directories.
0
votes
1answer
12 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
40 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
40 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
29 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
29 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
130 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
240 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?
2
votes
1answer
27 views
How do I handle this patch problem
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
2answers
93 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 ...
1
vote
1answer
59 views
What is the purpose of the command “yum list extras”?
According to the man pages, yum list extras performs the following action:
$ yum list extras [glob_exp1] [...]
List the packages installed on the system that are not available
...
2
votes
1answer
131 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
72 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
61 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
59 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
21 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 ...
1
vote
1answer
94 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++.
1
vote
1answer
88 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
46 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
224 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 ...
4
votes
1answer
220 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
54 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
327 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
82 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
165 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
3
votes
2answers
236 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
83 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
88 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
58 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 ...
5
votes
2answers
269 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
78 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
101 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
76 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
522 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
104 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
58 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
199 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
46 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
585 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
314 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. ...
6
votes
6answers
298 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
217 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 ...
7
votes
3answers
152 views
How do I compare a file with a floppy image and the actual floppy's content?
Is there a command that compares a floppy disk image (e.g. a .iso file) to the actual contents of the floppy the image was written on (e.g. /dev/fd0)?
1
vote
1answer
645 views
Diff, show modified line from right file only
I have file a and b and I would like to output lines of b that changed since it was cloned from a. Just the modified lines, no surrounding context, no diff offset marks.
How can I do that using shell ...
2
votes
1answer
84 views
Is there a way to define the preferred merge or diff tool under Unix?
I know that you can define the preferred editor by setting the EDITOR environment variable.
My question is if there is a similar solution for setting the preferred merge or diff tool.
2
votes
2answers
485 views
Difference of folders and files
I have two folders which have different folders inside. Those folders also contains different files. I am looking for the command that would give me the difference between those two parent folders. ...
2
votes
3answers
427 views
Get correct number of lines in diff output
I want to get the correct number of lines in the output of diff(specifically with -y and --suppress-common-lines options). Using a simple wc -l does not work, because if both files end without a ...
4
votes
3answers
2k views
How do I “merge” two text files?
I recently upgraded from Ubuntu 12.04 to 12.10 and at one point, it encountered an Apache config file conflict in apache2.conf. I didn't give me a merge option at that point, so I just rejected the ...
14
votes
1answer
2k views
What's the recommended way of copying changes with vimdiff?
When comparing files, and updating a source code repository, I like to use vimdiff. To copy changes made from one file to the other, I usually use a key sequence like this:-
Shift + V (select line)
k ...
4
votes
1answer
89 views
In Emacs, how do I inspect what has been modified in a buffer (before saving and overwriting the file)?
In Emacs, how do I inspect what has been modified in a buffer (before saving and overwriting the file)?
(In a sense, the requested action is an analog of git status and git add -i showing what has ...
2
votes
1answer
2k views
Recursively compare two directories with diff -r without output on broken links
I am using diff -r a b to recursively compare directories a and b. It often happens though that there are some broken links (the same broken links in both a and b directories and to the same, ...
