diff - Command-line tool to display the differences between two files, or each corresponding file in two directories.
1
vote
2answers
38 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
36 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
20 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
50 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
85 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 ...
0
votes
0answers
29 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
27 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
162 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
44 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 ...
2
votes
2answers
130 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
53 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
68 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
1k 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
100 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
145 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
140 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
101 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.
0
votes
1answer
96 views
blessdiff for the “full featured hexadecimal editor”?
I am trying to find some hex diftool which allows me to compare to documents in the view but also the internal differences like in bless so two bless windows side-by-side but with diff capability ...
0
votes
1answer
75 views
how to pipe output from git commands into unix diff utility?
I am trying to achieve something along the lines of
diff -ywB --suppress-common-lines `git branch --merged prod-server` `git branch --merged test-server`
so that I can know the difference of what ...
4
votes
0answers
49 views
Display only relevant hunks of a diff/patch based on a regexp
git log -G<regex> -p is a wonderful tool to search a codebase's history for changes that match the specified pattern. However, it can be overwhelming to locate the relevant hunk in the ...
1
vote
2answers
35 views
How do I generate diffs for a series of files?
I have a series of a few thousand files, all with filenames in order, so let's say file1.x, file2.x, file3.x, etc. All these files are in the same directory.
I know how to generate a diff from ...
2
votes
1answer
40 views
Using diff to show both contents of new files and that new empty files are created [duplicate]
After executing these 4 commands, directory "a" has file "1" with contents "test" and file "2" which is empty, and directory "b" is empty.
$ mkdir a
$ mkdir b
$ echo test > a/1
$ touch a/2
We ...
17
votes
2answers
346 views
How do I save the changes to my vim buffer as a patch file?
Is there a way to save the changes I made to my vim buffer as a patch file for the original file, without saving it as a separate file and using diff?
2
votes
2answers
49 views
What optimized tools are available for comparing directory contents?
I am mirroring a Subversion repository tag with svn2git and I want to be sure that when I checkout particular revisions, those I obtain from the git mirror match those from Subversion. My main problem ...
0
votes
2answers
84 views
How to turn Diff command into bash script with prompt
I have a list that i've copy and i want to paste it to the shell to give me just the repeated lines.
1
1
3
2
As i read about bash commands i've maded this:
cat > /tmp/sortme ...
1
vote
1answer
79 views
gzip files with cat and from pipe gives different results
Why does this give such output (both commands are supposed to do the same thing) and how can one make them give identical output?
diff <(cat some_file | gzip -c - | base64) <(gzip -c some_file ...
2
votes
2answers
156 views
How to compare two directories thoroughly without git?
Here thoroughly means “list all differ files, find those files with same name and different content, list the difference of content”.
Before I got a lazy solution, git init one directory and copy ...
1
vote
1answer
2k views
Patch command - can't find file to patch at input line
I generated patch using diff command with the number of context lines as 1 (-c option). My patch file contents:
*** /home/sk/abc/def/src/klm/a.py 2015-05-18 16:25:50.348398554 +0530
--- ...
1
vote
2answers
43 views
Getting the diff of a package update
Before (or after) updating a package with apt-get update, how can I view the source code diff between the the new and the old version?
1
vote
1answer
81 views
Diff of directory statistics sumarry (git diff --stat like for non-git repo)
Is there a tool (or diff option combination) which would produce output similar to git diff --stat?
I have two kernel sources and I would like to get general idea of what was changed in them. ...
5
votes
3answers
479 views
Compare the heads of two files in bash
I can do diff filea fileb to see the difference between files. I can also do head -1 filea to see the first line of filea or fileb. How can I combine these commands to show the difference between the ...
2
votes
1answer
46 views
Vim and unified diffs
In my daily work, I only deal with unified diffs, so I would like to define the alias
alias diff='diff -puN'
in my .zshrc.
This alias is not respected when I use the shell from the vim command ...
5
votes
2answers
73 views
Diff Entire Linux Systems
I have a base Linux system installed. I want to run a very large and complex third-party script that will make many changes to various parts of the entire system. These changes will include adding new ...
1
vote
2answers
40 views
Diff directories using modification time (mtime) and size instead of contents
Is there an option to have diff (-q) not look at file contents and instead just look at size and mtime? If not, is there a tool similar to this that has the option?
0
votes
2answers
424 views
Color diff output
I am new to unix I wanted to format the Unix files conditionally, I am currently working on diff command and wanted to know if it is possible to format the text of the diff command output.
Example:
...
2
votes
4answers
420 views
How to make diff command ignore certain lines of second file(bash)?
For example:
file1.txt:
I need to buy apples.
I need to run the laundry.
I need to wash the dog.
I need to get the car detailed.
file2.txt
I need to buy apples.
I need to run the laundry.
I need ...
1
vote
1answer
429 views
Output different lines when comparing two files
I have two text files with the same number of newline terminated strings. The lines in the two files correspond to each other. The lines in each file individually might be repeated.
I would like to ...
0
votes
0answers
25 views
What is the meaning of the -u option in the diff command? [duplicate]
In order to determine a certain file, I was told to do: ls /dev | diff -u foo. I looked the man page to the diff command up and found this annotation to the -u option:
-u, -U NUM, ...
2
votes
1answer
25 views
How to determine the only additional file in otherwise two identical listings?
I have done a listing of the device folder two times, one time without the sd-card in the slot and one time inserted, the system automatically adds one
file in the device folder.
$ ls /dev | wc -l
...
0
votes
1answer
39 views
Unified Patch: only use diff file
Is it possible to create a diff file that would work without having the actual files in the diff file?
e.g.: I have a folder /a and a copy of a: /b. In /b I edit multiple files and create a .diff ...
2
votes
0answers
234 views
Highlight differences between two files, similar to what watch -d produces
The command watch -d produces a very interesting diff: it shows the most recent iteration of the command, and highlights (with inverse video) the differences to the previous iteration. This works ...
2
votes
1answer
195 views
Diff tool with nice output like kdiff3
I like kdiff3 very much due to the way it displays the result. It can compare more than two versions of a file or directory and displays the differences in columns:
For directories, it displays ...
0
votes
1answer
173 views
What does dash “-” mean in Unix command line? [duplicate]
Given this diff command:
./a.out < 1.in | diff - 1.out
What does - mean after the word diff?
Thanks for the help!
0
votes
1answer
134 views
Compare logs without timestamp
I have a lot of logs I would like to compare. The problem is, that the first few characters in a line are a timestamp. How can I compare logs, ignoring timestamps.
For example, these two should be ...
0
votes
5answers
284 views
Compare one to one lines in 2 different files using shell scripting [closed]
I have two files:
File1 File2
abc abc
cde cde,xyz,efg,hij,...,n
efg lmn,opq,weq,...n
Now I want to compare File1 line1 with File2 line1, line2 with line2 and ...
1
vote
2answers
113 views
remove lines from an output file from diff
I have a script that uses diff -c then puts the output on a text file. What I want is to remove the line that does not have the "!" and display the lines with the exclamation mark. Is this possible? ...
1
vote
2answers
419 views
diff two directories, but ignore the extensions
I've got two directories with similar file names but different extensions. Here's an example:
DIR1:
- IN89284.wav
- OUT9920.wav
DIR2:
- IN89284.mp3
- OUT9920.mp3
I want to compare these ...
1
vote
0answers
65 views
Minimal diff between two texts
The iTunes Store Terms and Conditions just changed.
To avoid ending with random parts of my body being sewn to another person's body, I actually read the first version of these Terms and Conditions.
...
1
vote
3answers
1k views
Compare two files and print unmatched lines [duplicate]
I have two files with the below data; I need the difference between two files.
I tried with diff but it also shows line which are common in the two files: (22372 Dec 4 15:36 ...
4
votes
2answers
257 views
Comparing two files in unix and awk
I have to compare two files, file1 and file2. Each file has 56 columns separated by |.
First column is the employee number in the file, I will check whether same employee number is present in the ...
