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

learn more… | top users | synonyms

1
vote
1answer
18 views

How to mark files to manage the diff output

My collegues are maintaining a configuration file, which is deployed to production/test/staging environments by SaltStack. I am maintaining this file by using diff to see what has changed and code the ...
1
vote
0answers
29 views

Patching .iso files

sometimes I have only little bandwidth. Also I have access to a machine with high bandwidth via ssh over the low bandwidth line. So let's say, there's a new version of my favorite live system. The ...
0
votes
1answer
27 views

How to capture diff output from find command exec?

I am using Ubuntu (Precise 12.04) I am trying to write some bash script to see if file is changed via awk replace by using diff command. I did a test with the following: #! /bin/bash diff fileA.htm ...
0
votes
0answers
43 views

Incremental Backups of ntfsclone Images

I am attempting to make compressed incremental backups of a Windows partition using ntfsclone on Linux. Currently, I am making full ntfsclone images using something like the following command: sudo ...
2
votes
1answer
29 views

Diffing an entire hard drive, available tools?

There's an existing question similar to this that didn't get answered in the proper context (a massive volume of data to compare) at all, so I'm trying again here. I'm using SuperDuper to maintain a ...
0
votes
1answer
13 views

Recursively compare file identities in Windows environment using only standard Windows commandline tools

I want to ensure that deep directories of files are identical after copying. I've read this answer: http://superuser.com/a/414216/214579 However, neither fc or comp offer recursion. How would one ...
0
votes
0answers
13 views

Is there a diff-like tool that searches the directory for existence of the file or folder?

In an attempt to de-duplicate the data on my system, I've used tools such as Gemini for finding duplicate files across directories and diff tools like Kaleidescope for understanding how the ...
3
votes
2answers
121 views

How do I compare two folders recursively and generate a list of files and folders that are different?

tl;dr and an example I'm looking for a way to compare two folders recursively and output the relative paths all files (and folders) that are different (by size or by timestamp, à la rsync). For ...
1
vote
0answers
23 views

OSX Terminal: FTP upload only if file size different

I am currently using FileZilla to backup my Documents. The manual procedure for this is as follows: Sign in to FTP using username and password Open Documents folder on FTP site Drag documents from ...
0
votes
1answer
12 views

Diff content of a website recursively

I have a lot of tools I'm using and want to be able to monitor their changes through their documentation. An example would be Vagrant Documentation - https://docs.vagrantup.com/v2/. I want a solution ...
0
votes
2answers
37 views

compare two directory trees

I have two music libraries, one a newer version than the other. I would like to compare them to figure which files I need to copy from new music tree to old. I have tried diff --brief -r ...
0
votes
2answers
37 views

Merge two text files, with differences highlighted

I have two text files, which are almost the same except for some changes on a few lines. I would like to merge these two files into a single text file, with differences highlighted, so that I can then ...
0
votes
1answer
15 views

How to group “Only in” lines in diff at the beginning of the output

I did: diff -r directory1/ directory2/ Some files are different, and some files were only in one tree or the other, creating several Only in ... lines. How do I group these lines at the beginning ...
0
votes
0answers
156 views

Kdiff3 show conflict even that files have equal text and are binary equals

Like in title. Kdiff3 info dialogue shows that ( i do 2 way merge): Total number of conflicts: 0 Nr of automatically solved conflicts: 0 Nr of unsolved conflicts: 0 kdiff3 files a and b have equal ...
0
votes
1answer
27 views

Dynamic diff of one file

I am trying to diff one file over time using process substitution in bash. diff <(cat /path/to/file | sort; sleep 20) <(cat /path/to/file) I also tried: diff <(cat /path/to/file | sort ...
0
votes
0answers
16 views

Colorize only the changes and not the complete line in diff

I have to very similar files which usually only differ in the capitalization. Currently I'm using the default diff but seeing the actual difference can be hard. For example I compare files only ...
0
votes
0answers
17 views

Software for creating DB alter script that ONLY uses DDL scripts

I am looking for a software which can compare two databases by ONLY using DDL script (i.e. I dont want to create a schema but rather do it on the fly). Is this possible ? Any ideas ?
1
vote
2answers
32 views

Find two newest change files and compare them

I have a script that wgets a .txt file and datifies the names. I'd like to diff the changes between the newest & next-to-newest file. This is how I am able to select them: ls -t -l | awk ...
1
vote
1answer
38 views

recursive diff of files case-insensitive

How do I run a recursive diff when the filenames are the same but have different cases? For instance: ./Root/Directory/FileName.txt ./Branch/directory/filename.txt diff -r -i Root Branch only ...
0
votes
1answer
19 views

How can I `diff` two Accumulo tables?

If I wanted to compare two similar Accumulo tables and highlight their differences, how could I do this? My first thought is creating database dumps and running Unix diff over the files, but that ...
0
votes
0answers
54 views

Three way binary comparison for savegame hacking

Basically, I'm trying to compare a bunch of savegames to find where some values are stored. First of all, it's a rogue-like interpreted in WinGlulxe. I'm dealing with almost 100% binary save files ...
0
votes
0answers
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 ...
1
vote
1answer
27 views

Attempting to combine diff command and display last modified between dupes

I am attempting to do something a bit unique, and cannot find the right terminal command line to use. I am attempting to essentially solve for the following problem: I have two volumes of data that ...
0
votes
1answer
893 views

How can I diff binary files in git?

I assume I need to set up a difftool. What difftools work? How do you put the parameters in?
0
votes
1answer
42 views

How am I supposed to use diff in this situation?

I recently asked a Google Groups forum for help with setting up a Vagrant/Chef/Django VM thingamajigger, and I received the following help: The fabfile.py had some errors for me. After I fixed ...
0
votes
1answer
53 views

How to make redirected input count as command output

I have a simple C console program that takes some keyboard input and outputs prompts and calculations. I also have two text files: a file with input for the program, and a file that contains the ...
0
votes
2answers
46 views

What is the right tool to diff filecontents of a directory in OSX?

I know that I can use Git for some cases, but I still believe that there exists a simpler solution by default. Does there exists any tools by default in the newest OSX for the diff of filecontents in ...
0
votes
2answers
256 views

How to compare content of two files?

I got a mission to compare the content of hundreds of pair files. I have to quickly compare each pair and to provide an answer if that pair is equal (in content) or not. The files could be text or ...
0
votes
2answers
554 views

Diff to actually totally ignore whitespace

I am looking for an application that will diff two files, and actually ignore all whitespace, so for example: class foo { bar spaz } is equally equivilant to class foo{bar spaz} or, as ...
0
votes
0answers
16 views

Visualizing multiple word-based changes among many text files

I've written a piece of fiction with GitHub. I'm curious to see how my writing adapted over time. Did I keep eliminating then re-adding a word? Did some lines remain unchanged? Which paragraphs ...
3
votes
1answer
3k views

How can I make 'diff -X' ignore specific paths and not file names?

Doing: diff -r -X <ignore-list> <src-dir> <dest-dir> doesn't seem to make diff ignore entries in <ignore-list> if they are of the form <dir>/<file>. Entries of ...
0
votes
1answer
46 views

DIff ignore arguments from a file doesn't seem to be working

When I run the following command, it doesn't seem to be ignoring what I specify in the ignore.txt file. I have tried adding some of the arguments with -x, but there are way too many to do that by ...
0
votes
0answers
53 views

rsync with diff between unrelated files

I need a Linux program similar to an rsync -a foodir targethost:foodir2 copy, but for each file in foodir it should find similar files in foodir2, and transfer only the difference. rsync can't do ...
1
vote
1answer
64 views

is there a Diff tool for dropbox for Mac?

Is there a dropbox diff tool/app for Mac? So what I mean here in an app that highlights visually the difference between versions in a text file you have on dropbox. It would typically have two ...
0
votes
0answers
34 views

Using diff to compare files in different folders ->Ubuntu 13.04 [duplicate]

I have been using diff and know how to compare the contents of two directories (and sub directories) and to compare files. There was a command that compared all files in all subdirectories of a ...
0
votes
1answer
110 views

diff ignoring eol and whitespace

I would like to diff two files, such that end of lines and white space be ignored. Namely, I would like diff to find no difference between d1.txt and d2.txt: $ cat d1.txt ...
3
votes
1answer
521 views

Recursive diff and symlinks

I'm trying to diff two directories using (well) diff. However, diff actually follows symlinks and compares differences between the targeted files. I can't seem to find a way to not have diff do this. ...
0
votes
0answers
11 views

“Synchronize” between different paragraphs for diff in Windows

I have two files, which contain similar paragraphs, but on one file there are completely new paragraphs within the old ones. I use tkDiff. Is there a way to synchronize between the common paragraphs? ...
0
votes
1answer
34 views

How to know what are in a file and what aren't in another?

I doing a nrpe check for my nagios about the files that I backup, sending to Amazon S3. I have two files then, s3, which list all my files that are in Amazon already. And local which list all my files ...
1
vote
1answer
38 views

recursive diff with per-file preprocessing

How do I get a combined effect of diff -r left_dir right_dir and diff <(cat left_file | myfilter) <(cat right_file | myfilter) without much scripting?
2
votes
3answers
203 views

Compare file system properties/attributes of two files

There are many methods that can be used to compare the data of two files. That is not what I'm interested in here. How can I easily compare or "perform a diff" of what could be called (perhaps you ...
1
vote
2answers
276 views

Diff -b and -w difference

From the diff manpage: -b, --ignore-space-change ignore changes in the amount of white space -w, --ignore-all-space ignore all white space From this, I infer that the difference ...
0
votes
1answer
401 views

Modern looking interface for diff/meld type program (Mac OSX)

I'm using Mac OSX, and I was wondering if there was a good program for comparing two text files for differences? I have meld and the interface looks pretty old. It's just a small cosmetic thing, but ...
0
votes
1answer
61 views

Recursive diff on directories says files differ, but no output when I diff on the files

(in the Linux Terminal) I used diff --recursive --brief dir1 dir2 and it tells me that File dir1/file and dir2/file differ But then, I try: diff dir1/file dir2/file and there is no output ...
1
vote
1answer
105 views

linux diff: is there a way to list differences by when the files were last modified?

In the Linux terminal, I'm using diff --recursive --brief dir1 dir2 A couple of weeks ago, dir1 and dir2 were identical, but they have both been modified since then. I would like to order to ...
0
votes
0answers
41 views

Improve diff viewer in Visual Studio 2010

In Visual Studio 2010 you can compare a local file with the latest version/workspace version. This opens up a diff viewer showing the two versions of the file side by side with the lines that are ...
0
votes
1answer
351 views

git difftool doesn't launch Beyond Compare from Powershell or command prompt

I'm trying to use Beyond Compare 3 as my diff tool with git. I configured git with the following commands: (source: Using Beyond Compare With Version Control Systems) git config --global diff.tool ...
1
vote
0answers
445 views

How to only add lines using patch?

I'd like to be able to use diff & patch in order to write new lines to a file. To clarify what I mean a bit: Original file: test1.repo exclude=mongo* exclude=sqlite* ...
14
votes
3answers
2k views

How can I enable colored output for OSX diff?

I need to diff two files (not two versions of the same file, they are however tracked by git, but that is unrelated) and I would like some colored output, how can I achieve that? $ diff file_1 file_2 ...
1
vote
2answers
2k views

Rsync print only files that would have been changed

Is there a way to get rsync to print the full filepaths to all files that are different without actually transferring any files? Alternatively, I need a way to diff the files across two trees (over ...