Often I find myself working on a new project with a giant RDBMS whose schema I don't yet understand. I want to be able to mark a checkpoint in the database, do something in the app, and then go back to the database and ask it which tables changed (and ideally, what records changed). Is there a way to do something like this with SQL? I...
I need from time to time to compare files binarily but haven't found any open source tool that can do this. UltraCompare can but it's a commercial product. Anybody know of any? ...
Hi, I'm looking for a simple java lib/src to highlight differences between two Strings, case-sensitive. A html output would be great, but I would be happy to get the indexes of the diffs, something like: diff("abcd","aacd") > [2,2] diff("maniac", "brainiac") > ["man",brain"] or [0,3] or something like that The idea is to higlight ty...
Hello. I am working with another colleague in C# in VS2005 in a not very complex project. However, we have no version control system, we send each other our last version and copy the changes into our own files. We now have to merge both files (most of the project is a single form file) into a last version of the project. Any suggestion...
Hello, can some one recommend a good (hopefully free) command line diff utility. I would basically need to kick it off from .Net to produce some sort of a text file with the differences between two xml files. Thanks! ...
I'm having trouble applying a patch to my source tree, and it's not the usual -p stripping problem. Patch is able to find the file to patch. Specifically, my question is how to read / interpret the .rej files patch creates when it fails on a few hunks. Most discussions of patch/diff I have seen don;t include this. ...
I'm working on a mac, with some fairly old files. Different files were created by different programs, so some of them end with \r (mac) and some with \n (unix). I want to be able to run commands like diff, grep, etc on these files, but the ones that have \r are treated as one giant line. does anyone know of a version of diff, grep, etc...
Hi, I have a project, for example WORDPRESS. and I am use SVN. I have following copies: A. WP2.6 from wordpress.org B. WP2.6, I modify some core files (add/del/change some files' code) C. WP2.7 from wordpress.org I would like update Version A to C and keep the changes of version B. some of my changes maybe like that: Version A c...
I am trying to use the Tortoise SVN command line utility TortoiseProc.exe. The docs suggest that a command line like this: "TortoiseProc.exe" /command:diff afile.cpp` should do a diff and display the results in the configured diff viewer (in my case Tortoise's own one), but instead nothing happens - the viewer is not launched & no err...
I do a lot of file comparisons (source, logs etc.) and need to mask certain sections e.g. dates / times / line numbers which cause every line to be different. Beyond Compare allows you to pre-process the files but then you have to write pieces of code to do this. Is there a GUI type tool that allows you to mask sections of the file via...
In Beyond Compare, the line you currently have selected is compared on top of each other at the bottom of the window. Is there any way to accomplish this in vimdiff? ...
How can you get the diff of two word .doc documents programatically? Where you can then take the resulting output and generate an html file of the result. (As you would expect to see in a normal gui diff tool) I imagine if you grabed the docs via COM and converted the output to text you could provide some diff funcitonality. Thoughts? ...
Following a blog I created a batch file wm.bat "d:\svnroot\external\winmerge\WinMerge.exe" /B /WAIT "d:\svnroot\external\winmerge\WinMergeU.exe" /e /ub /dl %3 /dr %5 %6 %7 and tried calling svn diff | wm but that didn't work. So how do I integrate winmerge or similar utility with svn diff. Edit: Extending on David's answer below, ...
Let's say you have two instances of the same bean type, and you'd like to display a summary of what has changed between the two instances - for example, you have a bean representing a user's settings in your application, and you'd like to be able to display a list of what has changed in the new settings the user is submitting (instance #...
My web application is similar to StackOverflow in that different users frequently edit the same blob of text. Currently we only support plain text, and therefore it's easy to show users how the text has changed between edits. I want to support rich text in these fields, but my users are non-technical and therefore markup of any kind is...
I am going to be periodically pushing a set of text-based data from a web-page to a server, probably as JSON. For every push, none, some or all of the data may have changed. To reduce the amount of data I have to send over the wire I would want to only send a diff of the changes in each push. Do you know of any pre-made solutions / too...
I've found git mergetool to be a handy utility for merging diffs visually, but the way I'm going about it seems really wonky. Essentially, my process looks like this when conflicts are reported: Execute a git mergetool At the prompt, hit Enter to launch my diff tool (Meld or FileMerge, depending on which computer) Resolve the conflict...
Seems this would not be a deterministic thing, or is there a way to do this reliably? ...
I'm looking for a side-by-side diff program a la xxdiff or DiffMerge that, instead of diffing files, allows blocks of text to be dragged into either the left side or right side window. I'm refactoring some SQL embedded in source files, and it would be nice to drag the sql statements from each source file into the diff program instead of...
I have worked on several applications that saved XML data into a database. To date all of them simply overwrote the current XML contents with the new XML contents. I would like to save the changes to the XML to the database but not overwrite what is currently in the DB. Short of just creating new rows for changes and leaving the old...