Questions tagged [diff]
diff is a shell command to find differences between two files. It is common on all *nix based systems
294
questions
1
vote
1
answer
1k
views
Is there a way to annotate that a PR depends on another PR
If I create a Pull Request from a branch
git checkout -b branch-for-first-PR
# edits and commits
git push origin branch-for-first-PR
do some work in it, and then want to experiment with building on ...
- 113
0
votes
3
answers
755
views
How can I compare the source & destination paths with a different directory structure across different operating systems?
The source & destination paths have >100k different directories. I would like to compare the files between the source & destination without accounting for the differences between the ...
- 239
0
votes
1
answer
162
views
change windows partition device number as reported by cygwin stat
I have two partitions with the same device number:
$ stat -c "%D" /cygdrive/c
ec6d967e
$ stat -c "%D" /cygdrive/g
ec6d967e
I believe this is because G: was restored from an image ...
- 21
1
vote
0
answers
121
views
diff while ignore unicode whitespace characters (CJK full width space)
I'm trying to diff two files. One of these files contains extra full-width spaces (U+3000):
Text 1
Text 2
Text 3
Text 1
Text 2
Text 3
diff -w A.txt B.txt reports
2c2
< Text 2
---
> Text ...
- 111
18
votes
5
answers
13k
views
Is there a way to access files from one WSL 2 distro/image in another one?
I have several Unbuntu WSL 2 "installations" on my Windows 10 system and I'd like to be able to run tools like rsync and diff between them. Is it possible to mount/find where the files for ...
- 538
0
votes
1
answer
2k
views
Is there a way to make Unix diff -r compare only differences in filenames, but not check if any single file actually differs?
I need to compare two large directories with a lot of files in them. I tried using:
diff -r Directory1 Directory2
but unfortunately the process is really slow due to the amount of files and their ...
1
vote
1
answer
3k
views
How can i compare two frames of a Wireshark capture?
I made a capture of the USB traffic with USBPcap and Wireshark to debug a HID touchscreen.
Now i have identified the interesting URB_INTERRUPT packets, but how do i compare the HID Data of those?
I ...
- 197
0
votes
0
answers
23
views
Diff since Nth byte for large file backup
I've a hundreds of very large files (500GB+) that I've to sync daily to an external server.
These files are peculiar because they only change/append after the 99% of the file.
Hence I was wondering if ...
- 101
1
vote
1
answer
230
views
What is double plus mark in gitk?
git diff HEAD HEAD^2 shows a single +, but gitk shows 2, as in the following figure. I wonder why.
+ int k = 0;
+ for(; j < i; ++i){
+ for (k = 0; k < 1000; ++k){
++ if(groupids[k] =...
- 3,207
0
votes
0
answers
25
views
Find different file in directory
I try find one file that is different on folder.
I have 4 files i.e. file1, file2, file3 and file4. File from 1 to 3 have text "not uniq", file 4 is empty. How can i find this different file?...
- 123
2
votes
1
answer
443
views
Emacs ediff does not show inline word based differences
I am using emacs with ediff to compare two files. and my ediff view does not show inline differences. e.g., if lines from both files only have one word difference, ediff cannot highlight the word but ...
- 637
4
votes
2
answers
11k
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 ...
- 141
0
votes
1
answer
707
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 ...
- 21
1
vote
1
answer
388
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 ...
- 145
1
vote
0
answers
579
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 ...
- 13