Our win32 application assembles objects from the data in a number of tables in a MySQL relational database. Of such an object, multiple revisions are stored in the database. When storing multiple revisions of something, sooner or later you'll ask yourself the question if you can visualize the differences between two revisions :) So my q...
How do I compare 2 files, and produce a report showing the lines that contain differences, and which characters on those lines are different? Obviously, there are tools out there to do this already, but I would like to know how this is done. ...
I do a lot of code reviews mostly using "hg in -p /path/to/repo" command and it would be very nice if its output could be viewed in some external program(e.g vimdiff). Is there any way to achieve that? ...
I have three files with SQL INSERT statements, local base_ie_common_ancestor other. diff3 refuses to merge local base other without conflicts since local deletes last line while other appends more stuff after last line. Why is this a conflict? Delete the last line since base and other don't have it, append the rest from other since l...
Is it possible to ask git diff to include untracked files in its diff output? Or is my best bet to git add the new files I've created and the existing files I've edited, and use git diff --cached ? ...
scmdiff marks the differences between the checked in version of a file and the file that's being edited. It marks it by coloring the changed lines. Is there any way to view the changes using a vimdiff-style split instead of just coloring the changed lines? For instance, if abc is a file under version control, then I can use the follow...
Does anybody know of a open source Java library that will do robust diffing the text parts of pdf files? Ideally I would like something that would produce a diff in the for of a patch. ...
In MS Word, there's a nice feature called "track changes" that allows the program to track edits. This is useful when collaborating with others because you can enable various visualization modes where it's easy to see what others have changed. I'm in the process of editing a large amount of documentation written in LaTeX and stored in ...
I looking for a way to create Delta Diff Patches of Large Binary Files (VMWare Virtual Disk Files). Is there an implementation in C# or any useful methods in the the .NET Framework. Any help is appreciated. Thanks. rAyt ...
How do you perform a rolling diff between 2 files to determine only the portion of files that have changed? ...
For data validation, for example during migrations from one XML library to a new one, we need to make sure that the old and the new text are the same. For small files, comparing can be done manually, but for large files it would save time to see only the lines which are different, missing or new. Do you know a simple but reliable diff...
I want to get a diff between two versions of a code file (of the Java/C#) variety - and from that get a list of methods (names) impacted. Has this been implemented? I presume this would require an AST Analysis of the lines that come back from the diff. The point of this would be to refine checkstyle/findbugs to just work on the method...
When I am comparing two files in Eclipse (using, for example, "Compare With" --> "Local History"), what keyboard shortcuts are available? I would like to be able to go to the next/previous diff and copy the selected diff left without having to click the tiny little buttons. Thanks! ...
Hello, I'm starting tests to move from cvs to git, and I have a problem on all my tests. We maintain a custom copy of FreeBSD sources, so in cvs we do the following when a new FreeBSD version is released: Import new freebsd src as a vendor branch Merge changes on HEAD I tried to do the same with git, and it worked, but almost all F...
I have set my FileMerge not to ignore any file. However, it ignores my dotFiles. How can you make FileMerge to diff dotFiles? ...
I have FileA in branchA and FileB in branchB. The problem is that I can access only one file at time. I would like to be able to compare the files by FileMerge or meld, since they are the only diffTools whichI have found for Mac. How can you diff by meld/FileMerge the two files? [Solved]: 1st developed Problem: FileMerge does not al...
Walking the line here, I know, but... How does StackOverflow show the revision changes in the diff-like format they use. I don't care about SO per-se, it's just a convenient way to describe my requirement. I have an audit history of changes to a text field. I'd like to show the changes the same way SO shows revision history changes. I ...
Is there an algorithm or diff-like utilities to find difference between two csv files? Example: file1 ------- key1,value1 key2,value2 key3,value3 key5,value5 key7,value7 file2 ------- key1,value1 key3,value3 key4,value4 key5,value5 key6,value6 With this diff-like utilities it will output 3 types of records: Records that only exists...
How do applications like DiffMerge detect differences in text files, and how do they determine when a line is new, and not just on a different line than the file being checked against? Is this something that is fairly easy to implement? Are there already libraries to do this? ...
Task at hand — I have three versions of some code, developed by different coders, one “parent” and two “child”, and need to calculate, which one is closer to the parent one. Size of code at hand prohibits from manually counting diff's, and I failed to see any aggregate similarity stats in popular diffmerge tools I've tried. Hao shot we...