Questions tagged [diff]

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

Filter by
Sorted by
Tagged with
1
vote
2answers
83 views

Best way to compare two very large directories in Linux

I need to compare two directories on Linux filesystems on two separate servers in order to identify whether all the files from SERVER1 are present on SERVER2. The total data set is about 4TB of files ...
0
votes
0answers
46 views

make a difference between pcap files

I have two pcap files and I want to make the difference between them. And store the difference in another pcap file. I tried diff command but it's not suitable with the binary files and I used also ...
0
votes
1answer
71 views

Comparing non-git project with a git repo

I have a project that was always manually deployed to a server without Git (as the server was behind a firewall that could not access Bitbucket), even though the project is managed on Bitbucket on my ...
1
vote
0answers
19 views

How to include added and removed files to a unified diff of a CL in perforce

I want to create a unified diff or patch using p4 describe -du or p4 diff2 -u, to apply later with patch utility. But the problem I encounter that these commands skip the content of added/removed ...
0
votes
1answer
27 views

Get the changes before and after a script run in linux (based on date and or size)

Given a directory with a tree of directories and files inside of it, presumably containing log files. How to know which files got changed after running a specific application. Taking into ...
0
votes
0answers
31 views

How to expose different between content of webiste, which was downloaded by wget function

I wrote a script in BASH to downloads the entire contents of the local URL page to the directory, then creates a list of md5 downloaded files. Restarting the script once again downloads the entire ...
0
votes
0answers
18 views

MATLAB - Error using interp1>reshapeAndSortXandV X and V must be of the same length

I geht this error message when I try to derive my acceleration of the car. I think there is a size problem, but I don't know how to solve it. The data is measured from a car. meas.jerk.data = diff(...
0
votes
0answers
17 views

deleted files not showing up when doing DIFF on versions in TortoiseSVN

I have TortoiseSVN Version 1.10 installed. In my code base, i had three XML files. I deleted the XML files from the code base. If I "Show Logs" in TortoiseSVN, i can see that he files were deleted in ...
1
vote
2answers
142 views

Diff tool for finding a minimal set of changes

I have two versions of a text file, with many changes (including whitespace, linebreak differences, etc.). All of the diff tools I have tried (diff, diff --minimal, wdiff, kdiff3, meld) fail ...
6
votes
1answer
203 views

Why is GNU diff such a memory hog? [closed]

There are enough questions asking how to diff large files, as diff can't handle them. I'd like to know why GNU diff can't handle them. I did a tiny experiment. I diffed two identical datasets, ...
0
votes
3answers
136 views

Local Github Compare View

I am pretty new to github, and really appreciate its compare view: it shows the differences between diffenent versions, and allows users to comment on each change. I hope I can do the same thing ...
0
votes
0answers
41 views

Custom modify git diff to obtain sha, commit message and changes only

I have a list of git commits (around 10), i want to view the changes made between two dates: Currently, I am using git whatchanged (see below pic). But it displays lot of unwanted information like: ...
2
votes
3answers
299 views

How to diff three binary files to show only what changed between 1 and 2 and then changed back between 2 and 3?

I have three binary files (memory dumps). Call them file1, file2, file3. I'm trying to debug some software, and I'm toggling a switch. file1 = switch off file2 = switch on file3 = switch off I need ...
1
vote
0answers
43 views

vimdiff show differences with only parent rows

Two config files contain many blocks of the form block name { ..... sub block name1 { ......... sub block name2 { .... } } ..... } Example: Input (LHS) : ltm ...
0
votes
0answers
22 views

How to set up diff so that it copies all modified and new files and subfolders recursively from a folder at a given interval?

How to set up diff so that it copies all modified and new files and subfolders recursively from a folder at a given interval? Hi, I have a folder (A) with a large number of subfolders. I want to ...
2
votes
1answer
75 views

Compare and partly merge multiple projects without common ancestor

I'm looking for a way to compare/diff 3+ different, strongly related projects, none of which is the others' common ancestor and copy around ("merge") single chunks, and specifically test files. I do ...
0
votes
1answer
104 views

How to diff two files with same number of lines, and get only different lines

Given 2 files which have the same number of lines, is it possible the get a diff with ONLY change (c), in other words, WITHOUT additions (a) and deletions (d)? For example, here are 2 files with 10 ...
0
votes
1answer
80 views

use diff against text files with list of files to find different files by size and/or modified date/time

I need to compare two folders to find files that are either: different size and/or modified date/time missing from one I cannot run diff against the two folders in my situation. My plan was to use ...
0
votes
2answers
119 views

How to do a line insensitive difference (diff) in linux?

I have two text files where the order of lines does not matter. I want to find out the lines that are different in one file to the other. Using diff in linux finds the difference but also accounts for ...
1
vote
2answers
3k views

Compare three or more Word documents (*.docx)

I've seen multiple questions and answers for how to compare two Word documents, and I've seen some questions and answers for how to compare three or more raw text files, but I'm struggling to find a ...
0
votes
1answer
450 views

How to expand all sections in Text Compare of Beyond Compare?

I have a bunch of code differences in the Text Compare view of Beyond Compare... but they are easier to understand if the context of that block is expanded. I have many of these sections, and it's ...
2
votes
1answer
451 views

diff each individual line in first file against all lines in second file?

I have 2 TCL representations of a project that get generated by 2 different versions of the same tool, let's call them v1.tcl and v2.tcl These logs are normally logically identical for all intents ...
2
votes
0answers
219 views

What are the most reliable attributes for comparing two files in order to confirm/verify they are 100% identical?

I had the following situation: I copied 5.5 TB worth of data (in total over 100,000 directories and 10 million files) from an old disk to a newly-purchased external disk. I used Ultracopier on ...
1
vote
1answer
48 views

Git list of Files with more than 'n' modifications of last commit with respect to current dirty state

With a huge repository, it becomes challenging to track changes. Github displays one statistic per file (total number of lines modified; includes add or deleted as well). Can we list that statistics ...
4
votes
1answer
1k views

Ignore line endings when using Rsync

I want to sync two directories. The first one has CRLF and normal line endings, the second directory also has files with CRLF and normal line endings. The problem is, when I execute this code: ...
0
votes
2answers
410 views

pros and cons of incremental vs differential backup? [closed]

Back In Time says it saves full copies of changed files. And it links unchanged files via hardlinks. So this is a incremental backup. What are Pros and Cons of an incremental backup (like done with ...
0
votes
2answers
249 views

What is causing these two apparently identical files to have different hashes?

I am unable to figure out why the following two files are yielding different hashes (SHA1, CRC32, SHA384, whatever): https://cdn.jsdelivr.net/npm/jsonify-error@1.2.1/dist/jsonify-error.js https://...
0
votes
1answer
40 views

Does diff list all different lines after comparing two files?

diff file1 file2 Does diff file1 file2 list all different lines between file1 and file2 ,including all unprintable chracters ?
2
votes
1answer
1k views

Ignore certain changes in git diff

Is it possible to get a report from git diff or related commands that excludes a certain category of change? I've been asked to review a change where a huge number of files have undergone the ...
1
vote
1answer
1k views

Windows 10 fc command : Comma separated file comparison

I have two file's with 3 GB each to do a comparison and store the difference data into third file. Following is the sample data. File 1: June_01_2018.csv File 2: June_02_2018.csv Note: I want to ...
0
votes
1answer
54 views

diff on contents of a file

i'm trying to do a diff on two files and compare the contents and if they are different send an email. Below is my script that I cannot get to work for some reason. Any suggestions are welcome. #!/...
2
votes
2answers
2k views

Use diff to find difference in the output of two grep command

Is it possible to diff the output of two grep commands? I am currently searching for files, using different exclude patterns, and the output it pretty long, so i wanted to see if my new pattern ...
2
votes
1answer
562 views

Compare XML structures

I have 2 XML files. Their content is very different. But they differ not so much in the structure. Let's say the first XML implements a standard in version 1.0 and the second XML file implements the ...
0
votes
1answer
190 views

How to save diff output between two directories?

I'm running diff -rq linux-4.15-rc9/ ubuntu-bionic/ > ubuntu.diff but the output is just a bunch of lines with: Files linux-4.15-rc9/tools/perf/util/metricgroup.c and ubuntu-bionic/tools/perf/...
4
votes
3answers
88 views

How to compare two files and output lines which do not appear in the first?

If I have a file A containing a list of fields: 2017-04-23 2017-04-30 2017-05-07 2017-05-14 2017-05-21 2017-05-28 2017-06-04 2017-06-11 2017-06-18 2017-06-25 And another file B containing a list of ...
1
vote
2answers
220 views

How to compare multiple (thousands) of PDFs?

I have two collections of PDFs. One (collection1) is 1000+ PDFs, much larger in file size (100+GB), and in illogical sections (think pdf 1 (1), 1 (3), ... when it could and should just be one file). ...
1
vote
1answer
677 views

Watch + pipe + multiple arguments

I have a command diff -y <(xxd FILE) <(xxd FILE_) | colordiff and i want to put it into watch routine. Something like that: watch -n 0,1 'diff -y <(xxd FILE) <(xxd FILE_)' But i have an ...
2
votes
1answer
472 views

Windows, How come Diff.exe reports an error?

We have 3 files in 3 directories: d:\run.exe d:\temp\RunShortcut = d:\run.exe s:\temp\RunShortcut = d:\run.exe The above 2 shortcut files are 433 bytes each and shortcuts are present in ...
4
votes
1answer
398 views

Is there a ZFS-aware diff?

I often make snapshots of a ZFS volume (containing AOSP) make some changes (often extracting ZIP files over then top, or running scripts) and then run diff to see what has changed. This is really ...
15
votes
1answer
4k views

Git: Performing a diff between two stashes

Is it possible with Git to perform a diff between two stashes? For instance, I have the following stashes: stash@{2}: On peformanceFix#3: 20170728T164841 stash@{3}: On peformanceFix#2: ...
1
vote
1answer
121 views

diff won't work recursively

I'm trying to recursively diff two directories using the command line diff util. I have two folders, diff1 and diff2, with contents like this: diff2 is empty. But when I do diff -r diff1 diff2 I only ...
0
votes
0answers
117 views

password is in clear text within ssh

I understand this is related to sshd_config below: PasswordAuthentication yes What I don't understand here is my command below: diff <(ssh rx52019@hostname ls -R /home/rx52019 ) <(ls -R /home/...
-1
votes
1answer
427 views

diff says files are different even after sync with rsync

To synchronise two directories, I run diff -r -q path/to/dir1 path/to/dir2 1>/dev/null if [[ $? == "0" ]] then echo "Directories are exact copies of each other" else rsync -av --delete path/to/...
0
votes
1answer
738 views

Object expected Microsoft JScript runtime error 800A138F when viewing diffs inside of TortoiseSVN update log

After I get an update, I double click a JavaScript file in my update log and get the following error message: I've tried clearing everything inside of Settings -> Saved Data but I still get errors. I'...
0
votes
2answers
2k views

WinMerge says two files are identical when doing a diff on the directory, but comparing the files shows differences

I have two folders on my desktop, PreChanges and PostChanges. PostChanges contains a few more files than PreChanges, but otherwise everything in one appears in the other. If I use WinMerge to ...
1
vote
2answers
656 views

diff-so-fancy to compare files not under git version control

I really like the character-level highlighting of diff-so-fancy. How can I use it to compare files without using git?
1
vote
1answer
132 views

patch file based off single line

i have a file: unreliable, random content, multiple lines this_line_is_always_the_same_and_never_repeated_in_file unreliable, random content, SINGLE line unreliable, random content, multiple lines ...
0
votes
1answer
269 views

Make doesn't find cmp even though it exists

Trying to run make in cygwin, I get the following error message: $ make clean Error: cmp command not found, please install diffutils ../../../../Makefile:489: recipe for target 'clean' failed make: **...
0
votes
1answer
1k views

bash: why use “treat all files as text” flag with the diff command?

I see a few examples when using the diff command, particularly using it recursively for checking whole directories, to use "diff -ar foo/ foo2/". If I'm checking a bunch of mixed files (some text, ...
3
votes
1answer
8k views

I forgot to activate Track Changes in a Word document. How to highlight my edits?

After I saved the document and closed Word, I realised that I forgot to activate Track Changes. I have a copy of the previous revision. How can I highlight my (too many) edits before sending the ...

1
2 3 4 5 6