diff

Is there any built-in, add-in solution for visual studio to compare two files and display result with differences? I could't find one... I use WinMerge . Not as good as Beyond Compare but it's free and open source. Also check out Visual Studio Comparison Tools , it's a Visual Studio add-in that connects it to WinMerge. Here is an excellent post that describes integration of many 3rd party diff and merge tools into Visual Studio - including araxis, beyond compare, WinMerge and many others. The post is badly needed, since the command-line parameters that VS can supply aren't fully documented.

I would like to show differences between two blocks of text. Rather than comparing lines of text or individual characters, I would like to just compare words separated by specified characters ('\n', ' ', '\t' for example). My main reasoning for this is that the block of text that I'll be comparing generally doesn't have many line breaks in it and letter comparisons can be hard to follow. I've come across the following O(ND) logic in C# for comparing lines and characters, but I'm sort of at a loss for how to modify it to compare words. In addition, I would like to keep track of the separators

For the problem I'm working on, finding distances between two sequences to determine their similarity, sequence order is very important. However, the sequences that I have are not all the same length, so I pad any deficient strings with empty points such that both sequences are the same length in order to satisfy the Hamming distance requirement. Is there any major problem with me doing this, since all I care about are the number of transpositions (not insertions or deletions like Levenshtein does)? I've found that Hamming distance is much, much faster than Levenshtein as a distance metric for

I have a script which builds my application, uploads it to a remote machine, runs a performance test there and captures some metrics that I care about. The script creates a patch file for the local modifications I make in my workspace and shows it along with the performance numbers. This helps me compare the effect of various tuning options. If I want to recreate my workspace at a later date, I can use the SVN revision number and the patch. svn diff does not report a new files I add to the workspace unless I explicitly use svn add on them first. Is there some way to create a patch file which

I would like to make a SVN type patch file for httpd.conf so I can easily apply it to other hosts. If I do cd /root diff -Naur /etc/httpd/conf/httpd.conf_original /etc/httpd/conf/httpd.conf > httpd.patch cp /etc/httpd/conf/httpd.conf_original /etc/httpd/conf/httpd.conf patch < httpd.patch I get: can't find file to patch at input line 3 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |--- /etc/httpd/conf/httpd.conf_original 2012-04-26 13:36:08.331068438 +0200 |+++ /etc/httpd/conf/httpd.conf 2012-04-26 14:27:36.857075085 +0200 --

How can I get output like in git diff --color-words , but outside Git? Closest thing is wdiff -t , but it underlines/inverts things instead of using green/red colours and does not allow specifying my whitespace regex. git diff --color-words --no-index According to a comment from Jefromi you can just use git diff --color-words file1 file2 outside of git repositories too. Git version 1.9.1: git diff --word-diff=color fileA fileB you can say git diff --color=always --color-words , which will give you the color escape codes in the output. you are going to have some shell to interpret the color

Is there a way to show the git-diff filtered by a given pattern. Something like git grepdiff pattern changed file +++ some sentence with pattern changed file 2 --- some other pattern Unfortunately the simplest solution is not good enough git diff | grep pattern +++ some sentence with pattern --- some other pattern # not an option as doesn't put the filename close to the match I came with a workaround using awk git diff | awk "/\+\+\+/{f = \$2}; /PATTERN/ {print f \$0} " But would love to find out that there is a command for this. Not sure but isn't git diff -G <regex> flag OK? -G < regex> Look

Suppose I have two tables, t1 and t2 which are identical in layout but which may contain different data. What's the best way to diff these two tables? Try this: (select * from T1 minus select * from T2) -- all rows that are in T1 but not in T2 union all (select * from T2 minus select * from T1) -- all rows that are in T2 but not in T1 ; No external tool. No performance issues with union all . maxyfc You can try using set operations: MINUS and INTERSECT See here for more details: O'Reilly - Mastering Oracle SQL - Chapter 7 - Set Operations You can use a tool like AQT to create diffs between

I have to store two files A and B which are both very large (like 100GB). However B is likely to be similar in big parts to A so i could store A and diff(A, B). There are two interesting aspects to this problem: The files are too big to be analyzed by any diff library I know of because they are in-memory I don't actually need a diff - a diff typically has inserts, edits and deletes because it is meant to be read by humans. I can get away with less information: I only need "new range of bytes" and "copy bytes from old file from arbitrary offset". I am currently at a loss at how to compute the