I have a situation where I need to notify some users when something in DB changes. My idea is to catch pre_save and post_save signal and make some kind of diff and mail that. Generally it works good, but I don't know how to get diff for m2m fields. At the moment I have something like this: def pre_save(sender, **kwargs): pk = kwar...
Is there a useful command-line diff utility for VSS 2005? I tried this but if wants to compare my current directory with, it seems, some randomly picked path from the project. ...
I'm reviewing a patch that moved a lot of things around, added a few things, and removed a few things. I'm wondering if anyone's written a utility for picking out the unique adds/removes in a universal diff? That is, an add and a remove of the same line should cancel themselves out. Obviously this isn't useful all the time, but someti...
With C# .NET i would like to DL 2 webpages and find the DIFF between the webpage. Then i would like to program my app to allow me to label specific dif areas then parse for a series of urls. What diff lib may help me find each area? ...
In a content management system, moderators have to approve changes to existing articles. Currently the system shows the old and the revised version of the text in plain text. It is a pain to find the actual differences. In GoogleDocs, there is a 'Compare revisions' feature which highlights the differences between two documents. If the...
I'm using Eclipse's graphical diff tool to merge two different branches of a Subversion-hosted project into the workspace. Line-level differences are simple; I can just click the "Copy Current Change" or "Copy All Non-Conflicting Changes" buttons. But how do I use the diff tool to copy over file-level differences, i.e. files that exist...
I want to find a tool so that I can diff two files A and B, and apply those changes to a third file C, to create a fourth file D. kdiff3 is pretty close to what I want, but I've had some issues with its diff algorithm. DiffMerge is also pretty close, but seems to be more for situations where there is a reasonably recent common ancestor...
I have frequent need to test that XML files are correct and need a way of testing that 2 XML strings (or documents) are identical, such as: XMLAssert.assertEquals(String xmlExpected, String xmlActual); In addition it would be useful to show where the xml documents differed. This should be restricted to documents with standalone="yes...
I have been trying to write my own diff3 wrap script for SVN and I am wondering what the various parameters that get passed to --diff3-cmd are. The closest thing I could find so far is: How can I use Beyond Compare 3 as the diff3-cmd for svn? But it doesn't quite explain what all of the parameters do. I also tried to pass it through...
CVS diff has the option to display revisions side by side and denote diffs with usual patch symbols like: import zlib import zlib > import time import traceback import traceback import cElementTree as ElementTree ...
Does anyone know of any tools that allow diff'ing between two web pages semantic markup rather than content? Cheers. ...
What algorithm does CVS use when merging two branches (using the -j)? Is the CVS tag, branch, or date aware? Does it just do a plain text diff (for example, using the unix diff tool)? Does it use a 2 way or 3 way diff? If it uses a 3 way diff, what is the base version it uses? Thanks ...
For working with text that is prose, stored in plain text, I really like the output of git diff --color-words, but I don't like the way it is dependent on ANSI terminal escape sequences. I'd like to get output that I can use to turn into HTML, some kind of user-friendly raw character display, or to generate statistics on the differences...
I am attempting to write some test cases for some classes that involve testing the equality of two dimensional arrays of data. Here is my first stab at it: double[][] expected = { {0, 104, 0}, {145.5, 0, 0}, {83, 0, 0} }; double[][] actual = someObject.getArray(); Now, I see that JUnit does not have an 'array...
I'm looking for a diff tool that can also compare floating point values (within some tolerance) in text files. This is in addition to typical text-comparison diff functions, with options to ignore whitespace, ignore case, etc. A GUI (or full-screen console UI) is okay, but I'd really prefer a stream-oriented (stdin/stdout) tool. Here's ...
Anyone know how integrate ExamDiff with Mercurial? I have KDiff3 set up but couldn't figure out how to set up ExamDiff. Update: Per accepted answer, this .hgrc config worked: [extensions] hgext.extdiff = [extdiff] cmd.examdiff = C:\Program Files\ExamDiff Pro\ExamDiff.exe Can run ExamDiff with the comand hg examdiff ...
Using .net XsltCompiled transforms, whats the best way to perform date diffs? Is defining a C# code snippet via the ms:script CDATA block "good enough"? or is moving to a different transform engine worth it i.e. Saxon? ...
I'm looking for a C or C++ diff library. I know I can use the Unix diff tool in combination with system or exec, but I really want a library. It would be handy if the library could perform patches as well, like the Unix patch tool. ...
Is there a way to compare local and remote (FTP) file in NetBeans? There is an upload (and download) command in NetBeans. What I want to do is to see the changes between local and remote version in built-in compare tool when I am using download and upload and ideally select which changes to apply. In short, I would like to sync local a...
I'm using diff -Naur to send a single patch to a customer, in order to update their snapshot of our repository. I tried using git diff -p to get a single file patch, but apparently it doesn't include new binary files in the patch I know I should have used git-format-patch, but it creates patches which can be only used inside git and I ...