diff

What's a good algorithm for editing a "schedule" most efficiently?

This is for a small scheduling app. I need an algorithm to efficiently compare two "schedules", find differences, and update only the data rows which have been changed, as well as entries in another table having this table as a foreign key. This is a big question, so I'll say right away I'm looking for either general advice or specific...

Hibernate: comparing current & previous record

I want to compare the current value of an in-memory Hibernate entity with the value in the database: HibernateSession sess = HibernateSessionFactory.getSession(); MyEntity newEntity = (MyEntity)sess.load(MyEntity.class, id); newEntity.setProperty("new value"); MyEntity oldEntity = (MyEntity)sess.load(MyEntity.class, id); // CODEBLOCK#1 ...

Graphical diff for Mac OS X

Where can I find a convenient graphical diff-tool for Mac OS X (freeware)? ...

Apply file structure diff/patch on remote system?

Is there a tool that creates a diff of a file structure, perhaps based on an MD5 manifest. My goal is to send a package across the wire that contains new/updated files and a list of files to remove. It needs to copy over new/updated files and remove files that have been deleted on the source file structure? ...

Team Foundation Server (TFS) File Difference viewer - customize with other tool

Hello, I am using Team Foundation Server (TFS) for Visual Studio 2005. Whenever i wish to compare two file's versions TFS displays a window with the differences. The problem is that it is always splitted vertically. In fact, almost every time, i would prefer to have it splitted horizontally. I've already looked at TFS options and goo...

How can KDiff3 be used properly with TortoiseSVN to resolve conflicts?

I have TortoiseSVN set up to use KDiff3 as the conflict resolution tool (I find it shows more information useful to the merge than the built-in TortoiseMerge does). When I open a file with Tortoise's "Edit Conflicts" command it shows me the three files and I have to select "Merge->Merge Current File" manually. The problem is that KDiff3...

Stackoverflow diff system

How can I implement a text diff system that is similar to the one Stackoverflow is using. Could someone explain the overview of the system behind it? Is there any open source code available? ...

MySQL Diff Tool

Does anyone know any visual MySQL diff tools? I have about 10 machines all with their own instance of MySQL. No replication is taking place, since each machine acts independently of the others. However, their table structures must be identical, and I would like a quick way to verify their table structures. I'm not so concerned about ...

Javascipt library for syntax highlighting for code, then diffs, in HTML, at the line level?

Anyone know of a JS library that will allow me to syntax highlight a code block, then highlight line-level diffs? For example, in a subversion diff, I'd like to highlight the characters on the line that have changed (as well as highlighting the fact that there are change(s) on the line). Edit: I'm after something that will let me synta...

Compare two MySQL databases

I have a database in MySQL that I am currently developing. I have a copy of this database on my development machine which I modify as fast as I develop and a copy on a test server. My question is: Is there a way to compare the two instances of the database to see if there was any changes? Its not a real problem to simply re-deploy the ...

How to find number of lines changed between CVS versions?

I've spent most of the day making what are basically some housekeeping changes to the codebase of one of our projects (replacing all System.out.println() calls with log4j). I'm kind of curious how many lines of code I've updated with this set of changes. Is there anyway with cvs diff or another command to get an accurate count of how m...

What are the alternatives for meld (graphical diff tool) on OSX

I mostly develop on Linux and meld is indispensable for me. However, when I'm on the road I use a MacBook (leopard) and I want to use the same set of tools as on my main development box, meld being one of them. Although you shoud be able to install meld, I could not succeed with it. So... are there any alternatives that are as good (or ...

How to detect duplicate text with some fuzzyness

Some thing ago, I write small script using Text::DeDupe to remove duplicates of blog posts before I have to lay my eyes on them. After reading Syntactic Clustering of the Web paper on which implementation is based, I would love to have ability to find overlapping documents (e.g. snippets of blogs as opposed to full text, maybe also quot...

How to realize a diff function?

How would I go about implementing a diff function, such as stackoverflow's question revision history. ...

Is possible to change default diff tool in Mercurial?

Hi, Everytime that I do an 'hg diff file.ext' I end up using a console diff application. Is there a way to change that? I can't find a reference in Mercurial documentation (I'm not talking about merge!). I would like to use Kdiff3 or WinMerge (I'm using Windows). Thanks for your time. Best regards. ...

Git thinks I am rewriting one of my files everytime I make a small change

I have a medium size Java file. Everytime I make a change to one of my files, BuildTable.java, Git reports it as a massive change, even if is only a line or two. BuildTable.java is about 200 lines and the change in this commit only changed a single line. git-diff ouputs this: --- a/src/BuildTable.java +++ b/src/BuildTable.java @@ -1 +1...

Identifying files for a hot fix/patch

We (occasionally!) have to issue hot fixes for our product and do this by reissuing the affected files directly rather than with a new installer. The product has a large number of pieces, some managed code, some unmanaged. Currently development flags which build artifacts (exes, dlls) need to be shipped in a hot fix. We'd like to be a...

How do I view 'git diff' output with visual diff program?

When I type 'git diff', I want to view the output with my visual diff tool of choice (SourceGear diffmerge on Windows). How do I configure git to do this? ...

Excel VBA SVN Client / Integration

Can anyone recommend an SVN client for use in Excel with VBA (code modules only). Ideally, I would also like SVN to ignore case when diffing prior to committing changes so as to avoid excessive churn in the repository (VBA has an annoying habit of changing the case of variables all over the project). ...

How can I get a list of the differences between two JavaScript object graphs?

I want to be able to get a list of all differences between two JavaScript object graphs, with the property names and values where the deltas occur. For what it is worth, these objects are usually retrieved from the server as JSON and typically are no more than a handful of layers deep (i.e. it may be an array of objects that themselves...