In computing, diff is a file comparison utility that outputs the differences between two files. It is typically used to show the changes between one version of a file and a former version of the same file. Diff displays the changes made per line for text files. The output is called a "diff", or a ...
0
votes
1answer
14 views
Prevent diff from checking for newline at end of file
I have two big trees, which I want to compare. Some of the files in the tree differ just because one has newline at the end, and the other file lacks this newline. I want to ignore this fact. I have ...
0
votes
0answers
20 views
How to configure Eclipse so files with extension .foobar is diffed with a specific program when committing to revision control repository?
How to configure Eclipse so files with extension .foobar is diffed with a specific program when committing to revision control repository?
0
votes
0answers
34 views
Binary diff tool which would work the same way as diff(1) tool
Do you know Unix/Linux diff(1) tool works? It shows which lines were added and removed between 2 text files, and shows it in the human-readable form. I need the same kind of tool for binary files - ...
2
votes
2answers
27 views
List differences between remote folder (sftp) and local one
I wish to find a windows program (preferably with GUI) that will compare recursively a remote folder (SFTP) and a local one.
I would like it to list all the files and folders that are different, ...
0
votes
1answer
28 views
Diffing a PHP class file
I'm looking for a program that can diff/merge code files, and be aware of method names.
Currently, I'm diffing two files in WinMerge - one is a class called Core_Search, the other is a class called ...
2
votes
1answer
45 views
GUI Software To Compare Two Files, Get “Clean” Export of Differences?
Is there a way to do a "clean" export of the differences between files? Not a diff, or even a formatted report... just a clean .CSV/.XLS/etc export.
This is for people that are non-technical; we have ...
1
vote
1answer
42 views
GNU/Linux substitute for the Windows-based TreeComp tool
I miss the TreeComp tool from Windows on Linux. Does anybody know about a similar tool for Linux?
I've tried Unison & Unison-gtk (slow and cumbersome), diff (various), meld, mc, rsync (immensely ...
0
votes
2answers
117 views
Can any of the diff/grep utilities do a “file grep”? [closed]
Possible Duplicate:
Duplicate file finder
... to continue on the title, basically what I want is for me to give him the file, and the program goes through the whole project directory and ...
1
vote
2answers
95 views
How to open local files for diffing in Kompare from command line?
When I use meld to obtain visual diff, I can merely run this from the command line:
$ meld file1.txt file2.txt
... and meld starts, loads each file in a separate subwindow, and shows the ...
1
vote
1answer
63 views
How do you get Eclipse's built-in diff tool to ignore differences in whitespace?
I'm working on a large codebase that's been touched by many hands. As I work through bugs, I've been converting the source to be more readable which involves a lot of minor changes in indentation ...
0
votes
2answers
90 views
An Application to describe .patch files
Do you know any application that be able to describe .patch files?
I mean an application that be able to get .patch file & give me a human readable of the changes it make on files so I'll be able ...
0
votes
2answers
22 views
Tool to create a patch that modifies/adds files within a directory structure
I have a set of files that need a set of changes applied to them.
In this scenario I have a Java Application Server (distributed via a zip file) that I need to apply a set of known configurations to, ...
0
votes
2answers
105 views
Is there a tool to measure file difference percentage?
I am looking to compare two text files. Normally, I can just use diff to compare the two files to see the differences. This is great, except that I am more concerned with the percentage difference of ...
4
votes
3answers
131 views
How can I compare two directories, one being a remote directory?
I want to compare two directories, one is local and the other is on another machine.
How can I do that? Can I do it with diff?
2
votes
1answer
110 views
jump to file/line of current patch hunk in vim
If I'm viewing a multi-file diff in vim - for example the one produced by running :VCSDiff in a netrw buffer - and I position my cursor over a particular hunk, is there a way to jump to the affected ...
1
vote
0answers
52 views
Sorting XML files so that differences can then be found
I need to compare two XML files, each of which is about 13,000 lines long.
Sadly the code that generates these files doesn't generate the data in the same order each time (the data comes from a ...
0
votes
0answers
28 views
How-to apply diff on reorganized files?
I have one patch which was picked from repo A, and now I need to apply it on repo B.
Repo A:
src\
kill_kenny.c
kill_dolphin.c
Repo B:
src1\
kill_kenny.c
src2\
kill_dolphin.c
...
0
votes
3answers
85 views
Is there a diff utility that allows you to exclude columns?
For example, I have a text file, each line is a long string. I want to exclude 2 "segments" of this string, say columns 1-7 and 20-22. So the bottom 2 lines below would be a match:
...
1
vote
5answers
100 views
Diffing tools for Mac OSX
Are there tools for diffing without subversion?
Right now I am just writing code on my local but the ability to diff versions would be nice...
0
votes
1answer
53 views
Windows: Which diff tools doing directory diff from command line to file showing diffs only?
I'm looking for diff tools that:
Run on Windows
Can be kicked off from a batch file
Can dump results to a file (silent mode)
Show only diffs in the file
What should I use?
2
votes
1answer
48 views
How can I gather the diff between two folders (only the diff) into a different location
Basically, what I want to do is find the difference between two music folders (structure example below), and copy that diff to a different location.
Structure of content for both folders:
Album ...
3
votes
1answer
296 views
WinMerge and Diffmerge
I prefer Winmerge to Diffmerge.
But the one thing I envy is diffmerge's folder diff feature.
Diffmerge shows, for complecate folders and subfolders, only different files(not folders).
Winmerge shows ...
1
vote
0answers
123 views
Binary Visual Diff Tool for MacOS X
This might already be answered, but I did not find an answer that really matched my needs. I'm looking for a visual diff tool that can diff binary files. It was also OK if it was integrated into a ...
0
votes
2answers
76 views
Confirm that two filesystems are identical, ignoring special files
/media/A and /media/B should be identical, but I want to confirm before deleting one.
Duplicate file finders don't work, because they'll find two copies of the same file within B, for instance. I ...
1
vote
0answers
51 views
StatSVN generated XML is slightly out of date
There are no StatSVN questions on superuser, but why not start? ;-)
Here's my problem... I generate a log from subversion with:
svn log -v --xml > log.xml
The latest revision that shows up in ...
3
votes
2answers
431 views
Binary diff/patch for large files on linux?
I've got two partition images (A and B) and want to use them to create a patch that I can apply on A on another computer in order to get the new B image without flooding the network. I have the ...
4
votes
1answer
70 views
What options do I have for comparing web pages
What are my options for finding the diff between some pretty complicated web pages?
I am trying to see why Server A works when Server B doesn't. Both have the same software on them, and, as far as I ...
1
vote
1answer
41 views
How do I diff an RSS feed against last time it was run?
I have a feed - for example
2011 Patents of ultraviolet screens
If I run this next week, I would like to see if there had been an update since last time I looked - are there any feed readers that ...
0
votes
1answer
40 views
Compare Guitar Pro files
I am looking for a tool that can diff/compare Guitar Pro (5) files. Which of these file types should/could I use to compare tablatures? GP5 exports these file types:
MIDI
ASCII
MusicXML
GP5
These ...
0
votes
0answers
42 views
How to make gnu diff output not to group changes but show then one line at a time [closed]
Possible Duplicate:
Ungroup diff's output
I would like the gnu diff output format to be something like:
< first line original
> first line changed
< second line original
> ...
1
vote
1answer
69 views
How to configure BeyondCompare to mark newline differences as unimportant?
Newline additions in the middle of a line in BeyondCompare are marked as important. I want them to become unimportant. How to do that?
Example:
A:
<img src="a.gif"/>
B:
<img
...
5
votes
2answers
166 views
3
votes
1answer
534 views
How can I diff two network dumps from tcpdump or Wireshark?
I'm having a problem with one of our customers' embedded computers. They seem to discard some network packets which they should not. I can capture the TCP communication from a managed switch outside ...
3
votes
2answers
580 views
GUI tool for applying patch files for windows
There any number of good GUI diff-tools for windows (I use Araxis Merge, and kDiff3), but none of them (that I can find) will apply a patch file. I would expect it to work like this: I open a base ...
1
vote
1answer
120 views
How to ignore whitespace in Kaleidoscope (diff tool)?
In Kaleidoscope, how do I configure it to ignore whitespaces?
0
votes
0answers
36 views
How to diff two mails in outlook
I know a guy who is always re-sending me (rather long) emails with little changes. (i.e. a changed name or date)
Is there an easy way (preferrably an addin in outlook) to visual diff (visual like ...
0
votes
1answer
51 views
Recommend a diff tool to show and explain some changes in a document
Now I'm in process of contract negotiation with a private company. They sending me the contract, I'm making some changes and then sending back to them for verification. Now they asking me to explain ...
0
votes
1answer
90 views
File comparison, one-to-many
I need a program that allows comparing one text file to many others without having to open each one manually.
This is how it would work:
1) select the file which all others will be compare with
2) ...
2
votes
1answer
101 views
How to scroll the diff buffer easily in Emacs while point is on the minibuffer
In Emacs, after a lot of editing, I press C-x s (save-some-buffers), then Emacs asks "Save file ...? (y,n,.... d ...)" for each file, I sometimes answer d (diff) to see the changes, but then it's not ...
0
votes
1answer
54 views
Ungroup diff's output
I've got two files, and output of diff looks like this:
33428,33429c33428,33429
< lucid-security|main|icedtea-6-jre-cacao|6b20-1.9.2-0ubuntu1~10.04.1
< ...
2
votes
1answer
451 views
Can I use an replace internal diff in Total Commander with an external diff program?
Since I don't really like Total Commander's internal diff 'Compare Contents' used in Compare by content and Synchronize Dirs -> Compare left & right I want to use something else like Winmerge or ...
0
votes
1answer
71 views
svn diff software that simply downloads changesets
Does anyone know any simple software (preferably without installation) that allows to download changesets of specified revisions and save them as "changesetX.diff/.patch"? For some reason Windows ...
0
votes
1answer
132 views
Howto make a diff of a bios or backup/ restore all bios settings
I'm using an Dell M90 Precision Laptop which has a NVidia Quadro FX 2500M graphics card and is running Windows XP.
Laptop has been running fine - but a few weeks ago screen went 'white' - restarted ...
3
votes
2answers
302 views
How to diff file names in two directories (without writing to intermediate files)?
I am trying to do something along the lines of:
diff `ls -1a ./dir1` `ls -1a ./dir2`
But that doesn't work for obvious reasons. Is there a better way of achieving this (in 1 line), than this?
ls ...
1
vote
1answer
65 views
In microsoft Word, is there a way to find the differences between 2 similar documents?
I have made changes to one copy of a document. I also have a copy of the original file.
I would like to find out what I have changed.
Is there a way to get Word to tell me?
I am using MS Word ...
1
vote
1answer
617 views
Use Meld instead of Kompare in KdeSVN
i tried using Meld as external diff in KdeSVN as meld -on - (settings>configure kdesvn>diff&merge) but Meld complains that the usage is wrong:
meld: error: no such option: -o
Finished
Usage:
...
1
vote
2answers
101 views
diff unified output; supress @@ lines?
When using diff, is there a way to suppress the first two lines (listing the file names and times) and all the lines beginning with @@ in the output? All I want are the lines that show what to delete ...
2
votes
2answers
121 views
diff + print only string from the source file without extra information from the diff
When I perform diff between old to new files
I get that DDDC string exsist in the old file by the sign "<" as the follwoing
diff -w old new
103a104
> BBB
224c225
< DDDC
But please advice ...
1
vote
2answers
211 views
Check if there are changes on file system (Ubuntu 10.10)
I have to get my PC to the service because sometimes the system hangs and suddendly reboots without any reason. Anyway, I will create a test user if they want to start the computer. Moreover I think ...
2
votes
1answer
134 views
Mercurial: How I can use external tool for diff?
I want to use kdiff3 as a tool for comparing different versions of a repository.
Is there a way how one can do it?
