diff - Command-line tool to display the differences between two files, or each corresponding file in two directories.
3
votes
2answers
30 views
rsync claims different files, but diff does not?
I have a file both locally and on server. I first try running rsync in "dry-run" mode, to see if there are some differences between the files:
$ rsync -aP --dry-run [email protected]:/home/dir .
USER@...
1
vote
0answers
6 views
Vimdiff copy above/below
do and dp are kinda limited to take one or another version of the conflict, in many cases it's just java imports when you need both changes, is there any way to make a map that copies the other side'...
2
votes
1answer
25 views
diff - showing changed lines in different section than inserted lines
(I'm running into this in a context of using vimdiff, which relies on and interprets the output of diff, so I think this is a diff question.)
Given these files, the first having 2 lines, the second ...
4
votes
1answer
32 views
Binary diff of two folders
Let's say I have two folders: before and after.
./before:
bash
./after:
bash
The bash in the before folder differs from the bash in after.
Using bsdiff or a similar program, is there a way to ...
2
votes
0answers
37 views
Why do two directories differ after syncing with rsync?
I copied some directories on one removable drive to another removable one using rsync.
The command used was:
rsync -avPS <source> <destination>
rsync doesn't report any errors.
After ...
3
votes
2answers
43 views
How to get character level difference using “diff” command in Linux using shell script?
I have two SQL files, one is old.sql and the other one is new.sql.
Suppose old.sql contains a table with three fields, Emp_Id, Name and Address and data stored in old.sql as follows:
Insert into ...
1
vote
3answers
106 views
How can I compare different files without opening them?
I have two directories A and B; each one contains a lot of sub-directories
geom001, geom002 ....etc
each sub-directory contains a file named results. I want to compare, without opening any of them,...
0
votes
1answer
31 views
Use Diff to Exclude Quote Symbol - "
An Abnormal one.
In simple i have two Source folders.
Both have different code sets i want to compare.
But there is one Symbol that will show multiple differences that i want to ignore.
Its between ...
1
vote
2answers
46 views
Diff patch output saved to a file. How to see it syntax-colored?
I have a folder with subfolders that contains text files.
Every now and then I run a script that makes a copy of that folder tree and then creates a new one with fresh info.
After that, having the ...
1
vote
2answers
84 views
Exclude PIDs when comparing strace output
I want to debug like:
strace -fe open python /usr/bin/gnome-tweak-tool 2>>/tmp/hello.log
strace -fe open python /usr/bin/gnome-tweak-tool 2>>/tmp/hello2.log
Then use kdiff3 to compare ...
1
vote
0answers
40 views
A patch that doesn't contain line numbers, is it possible?
I would add two lines of text to a file if they don't exist there yet. The lines can be in various positions in that file. So a regular patch will rather not work. Can there be a simplified patch, ...
0
votes
1answer
21 views
Applying a single patch to files in multiple directories
Directory structures looks like this:
orig/l1/l2/file2patch
orig/l1-2/file2patch
Diff'd with
new/l1/l2/file2patch
new/l1-2/file2patch
I get the correct diff between these files and save it in a ...
1
vote
2answers
99 views
Diff: only compare if file exists, not contents
I want to use Diff only to check if files and directories exist the same in two locations but NOT compare the contents of the files themselves, because that's all I need and a regular Diff just takes ...
1
vote
1answer
43 views
Compare independent lines in two files [closed]
I have two files, each with 500k+ user accounts. I need to find the differences between the two (the missing accounts/delta).
Each file is in a simple format, each line contains an email address in ...
0
votes
1answer
31 views
How does the diff command handle caching?
I became curious when I was diffing two large (>326MB) files, and noticed that the second run took much less time than the first. This was frustrating, since I was trying to time the second run, to ...
-3
votes
4answers
101 views
Comparing 2 files
I have the need via a script to compare 2 files contents and if the contents are different then execute another script however is the contents are the same do nothing. I've tried using the DIFF ...
3
votes
1answer
47 views
How to upload a file and then check it and run some other commands using only ssh, cat, and diff in a single SSH session?
The goal is to change some parameters on a lot of devices on connections that are kind of unreliable (wireless)--according to csv that has the format: IP,Parameter,Parameter
I would like to make a ...
1
vote
4answers
76 views
Silent result with two identical files in diff: how to show them?
When I set the -s parameter, diff also print files, that are different.
diff -s $FIRST_FILE $SECOND_FILE
0
votes
0answers
17 views
gtksourceview complains about a missing style - but it's right there
I'm using the meld tool to view some source changes, in C++ and CUDA code. At some point I get the error message:
(meld:19240): GtkSourceView-WARNING **: in file /usr/share/gtksourceview-3.0/language-...
1
vote
2answers
54 views
Color output of linux command similar to 'watch -d' to highlight differences?
I'm at the beginning of shell scripting etc. and a bit challenged to find the proper way of colorzing a command's repeating output, similar to the -d option in the watch command.
I want to see the ...
1
vote
3answers
36 views
diff without including removed content
I'm using diff and patch to patch some files. In my situation, I am not permitted to distribute any of the original file.
Right now, the diffs look something like this:
1c1
< Hello, this is the ...
5
votes
2answers
88 views
Search directories for multi line string
Looking for a way to recursively search a repository for all files containing a multi line string and return the file names that contain it. The paragraph is just a header approx 30 lines.
So I know ...
0
votes
1answer
23 views
diffing two version of software,and do the interdiff
I have got some kind of software in version 1.2.0 (lets call it 120), my colleagues made changes in this software (they created custom module for this software by changing source code of software) ...
0
votes
2answers
34 views
Patching diff-files
I've downloaded a tarballed version of 0.85 "MTR" -> http://www.bitwizard.nl/mtr/
and installed it.
I later saw that a 0.86 diff file exists. I downloaded this in order to patch it, but am confused ...
5
votes
2answers
35 views
diff consuming huge amount of memory and cpu
I have two files, all.txt (525,953,272 records) and subset.txt (525,298,281 records). Each record is nothing but a 17-digit ASCII integer. Both files have been sorted, and duplicate records within ...
0
votes
1answer
41 views
Compare a certain lines from multiple documents
I want to compare a certain lines in a multiple documents. I tried using diff and comm, but the conditions are these,
the documents are in a different working directory/folder, I could use a ...
0
votes
2answers
49 views
What do the numbers in the “@@” line mean in output of diff? [duplicate]
Here is an example of Unix Shell program diff, from Version Control with Git, by Loeliger, 2ed:
Let’s look at the diff in detail.
In the header, the original file is denoted by - - - and ...
8
votes
2answers
71 views
diff characterwise
Is there a stable tool (option/plugin of an existing tool: vimdiff, diff, etc) in Linux to do diff between two text files characterwise?
I would like to see the longest common subsequence between my ...
1
vote
2answers
93 views
Packaging a directory and its contents as a diff patch?
I have a small project folder with text files, which I'd like to post somewhere in order to ask a question on a forum. Let's take, in the simplest case, that I have something like this:
mkdir aaa
cd ...
12
votes
3answers
526 views
diff reports the same line as different in 2 files
I have 2 files containing a list of songs.
hdsongs.txt and sdsongs.txt
I wrote a simple script to list all songs and output to text files, to then run a diff against.
It works fine for the most part, ...
6
votes
2answers
261 views
What is causing `diff` to run `git diff`?
I'd like to use diff as described here and in the documentation I see when I type man diff. However, when I type diff, what I get is this:
~ ❯❯❯ diff
usage: git diff --no-index <path> <path&...
2
votes
1answer
33 views
Compare two files, while overriding second file's size
I am trying to verify a backup that I made using the following command:
dd if=/dev/sda of=/dev/sdc2
I backed up the contents of /dev/sda (internal hard drive) to
/dev/sdc2 (external backup drive, ...
8
votes
4answers
429 views
Compare two URL lists and print newly added URLs to a new file
I am initially producing two files which contain lists of URLs—I will refer to them as old and new. I would like to compare the two files and if there are any URLs in the new file which are not in the ...
1
vote
2answers
66 views
Find values in a file from another file
I know, the title is not clear. I have 2 files, in one of this I have some values and I need to find them in another file. Instead to grep for each single value, I would use the first file to do ...
2
votes
2answers
132 views
How can I check if a directory contains the same files of a TAR archive?
Let's say I have a folder Documents and a TAR file Documents.tar, how to check if the tar file contains the same files that are present in the directory?
The more obvious solution to me would be to ...
1
vote
1answer
48 views
Diff command with file type exceptions
While comparing 2 fairly big directories using diff -rq .... I want to exclude certain file types like 'tar.gz' or 'error_log'.
How do I do that?
1
vote
3answers
76 views
Compare two file contents horizontally and vertically
I have two files:
File1 has the below contents:
1 2 3 4 5 6 7 8 10
File2 has the below contents:
1
2
3
4
5
6
7
8
9
10
How can I find the difference between two files and print the odd number ...
2
votes
2answers
104 views
Was 'diff' included in the first version of Linux
What is the list of programs that were available in the first public version of Linux distribution (not just kernel)? I am specially concerned when this distribution was released and if diff utility ...
3
votes
1answer
3k views
How to fix “Hunk #1 FAILED at 1 (different line endings)” message?
I am trying to create a patch with the command
git diff sourcefile >/var/lib/laymab/overlay/category/ebuild/files/thepatch.patch
when I apply the patch, it gives me
$ patch -v
GNU patch 2.7.5
...
2
votes
2answers
38 views
git --diff like command for Linux local dirs
dir1 has 1 file and dir2 has 2 files as below:
/tmp$ ls dir1
file1
/tmp$ cat dir1/file1
line1
line2
line3
/tmp$ ls dir2
file1 file2
/tmp$ cat dir2/file1
line1
/tmp$ cat dir2/file2
line1
/tmp$ diff ...
1
vote
3answers
377 views
How to pipe output of find as input for diff?
This is a basic question regarding bash but I could not find a solution.
I have many subdirectories with identically named files and I want to compare all of them for identity.
I can return list of ...
2
votes
1answer
301 views
How to apply simple patch (reverse detected)
I'm trying to create and apply a simple patch to fix a bug with gradle.
I copy the file (/usr/bin/gradle) to my working directory, then make the change. I then create the patch:
diff -u /usr/bin/...
2
votes
2answers
287 views
Applying a diff patch
I've never patched anything in Linux, and I can't exactly figure out what the guy who wrote this post (second paragraph) means. That target source is qemu from github and the changes to apply are:
...
1
vote
2answers
183 views
Comparing directories using diff
I'm trying to compare two directories that contain binary files, on AIX 6. I'm using diff in preference to dircmp, as I'm trying to maintain a consistent output format between this and my Linux ...
3
votes
3answers
86 views
Rebuild original file from diff files to save disk space
Every day 10GB text file is downloaded, the file is ~200 million lines and ~1% of the lines are changed the next day. I want to keep daily files as backup, but I'm trying to save disk space by using ...
17
votes
5answers
2k views
Why use diff/patch when it is easier to just use cp
diff -u file1.txt file2.txt > patchfile
creates a patch file which consists of instruction for patch to convert file1.txt to be exactly like file2.txt
As the title says, Can't this be done using ...
2
votes
3answers
346 views
Difference between files in directory
I have two directories with same files but with some difference in their contents. I want to list down those files which are differing. For example
There are two folders Folder1 and Folder2 with ...
4
votes
1answer
162 views
Pass BASH array to diff like file contents
I have two bash arrays, say:
arr1=( 1 2 3 )
arr2=( 1 2 A )
and I want to compare them using diff. How could I pass the arrays as if they were the contents of a file?
I tried a few variations, but ...
2
votes
2answers
182 views
Find differences in file and sorting file by key
So I have two language files, english and french. They are in this format:
key=translation
An example in English would be:
ui.title=My Title
And in French:
ui.title=Mon Titre
So I need a ...
-1
votes
3answers
334 views
Difference between two files
I have two files , say a & b. I want to compare both the files and get the differences in the third file along with the file name. Can anyone help me out with a simple command.
