I'd like to be able to diff files / directories directly from the Linux Kernel GIT repository without having to download full source. Specifically, I'm interested in two potential solutions: The ability to do diff's via a web browser ( firefox ) A GUI utility for Ubuntu that can do remote diffs. A tutorial how to setup option #2 Edi...
I can get diffs between two revisions using something like svn diff -r 100:200 > file.diff But the problem is that there are many lines that show up due to change in whitespace. Is there a way to only write those lines that actually change in a significant way and not just in whitespace? ...
EDIT: Primarily, talking about code written in C. Someone sends me a diff to review and I know I can take the "before" code, apply the diff (patch) to get proposed "after" code, and open both, pair of files by pair of files, in a difference viewer (e.g. WinMerge, Araxis Merge, etc.) to review the change. On the other hand, if I want to...
I am working on a system which needs to keep constant (and I mean constant) track of browser side changes to a textarea via AJAX requests to the server. Ideally, every character would be stored as a row in the database, along with the position it was inserted and a timestamp. I am hoping that there is either a good Javascript library th...
I would like to compute the diff between two XML files or nodes using XSL/XSLT. Is there any stylesheet readily available or any simple way of doing it? ...
I frequently need to compare SQL procedures to determine what has changed in the newest version. The problem is, everyone has their own style of formatting, and SQL doesn't (usually) care about where one puts their newlines (e.g. where clauses all on one line vs. newline before each AND). This makes it very difficult (especially for lo...
I just downloaded and installed the newest Tortoise 64 bit on Win 7, and then start up TortoiseDiff from START -> All Programs -> TortoiseSVN -> TortoiseDiff It used to be able to diff two source code file, but now it seems like it is an image diff'ing tool. Anybody knows how to get the tool to diff source code files? Update: If t...
I inherited a project originally stored in CVS with all the revisions. I made quite a few edits, and I'm trying to compare all the changes I made in the original directory, in regards to new files added versus the old ones. Is there some sort of utility for hg/git where I can do a tree diff, or something of that nature? So that say, the...
I need a minimal diff for similar 1000 byte blocks. These blocks will have at most 20% of the bits different. The flipped bits will be like radio static -- randomly flipped bits with a uniform distribution over the whole block. Here's my pseudo code using XOR and lzo compression: minimal_diff=lzo(XOR(block1,block2)) Since the blocks a...
I have a large project that has many changes not yet checked in. I want to check them in but have them only take effect when a certain symbol is #define'd CVS does have the ability to format diffs with #ifdef's inserted using the --ifdef argument. However, this does not merge the #ifdef's back into my working file. Even worse, the ou...
Hi, I am not sure if anybody has experienced this. I am working with a very large file having 7000 lines of code. I made a lot of changes and when i compared the file with the repository version, it showed me incorrect differences. I guess the diff algorithm buffers only limited number of lines ahead/behind for searching the current lin...
I'm looking for a diff tool that will allow me to compare just a sub-section of a file with a section of another file, or even of itself. Preferably eclipse based but will take all suggestions. Yes I know I can copy out the two sections into different files and compare those, but that is very tedious when you are trying to do a large am...
We use subversion and during every check-in, a script creates a patch file with all the diff. Now for the same issue/defect there could be multiple check-ins and we end up with multiple patch files. Now to see consolidated changes for an issue all the patch files have to be merged. Is there a way to do that? Or another way to solve the ...
Can anyone suggest a command line xml differencing tool for Solaris? I want to call one in a regression test script, so it's important that the tool can be called from the command line and return a status to indicate whether the files contain any differences. The tool must have an option to ignore attribute order. Thanks, Dave ...
Just wondering what's out there that everyone likes. I have to merge some changes among several developers (C#) and wanted to see what kind of alternatives to windiff are around. ...
Here is a command sequence showing distinct svn diff behaviours for adding versus copying files: $ ls -A foo .svn $ svn cp foo foo.svn-cp A foo.svn-cp $ svn diff foo.svn-cp <nothing> $ cp foo foo.cp-add $ svn add foo.cp-add A foo.cp-add $ svn diff foo.cp-add <contents> Some notes to head off irrelevant answers: I un...
In CVS, my working copy (WC) is on a certain branch (which we'll call "foo"). There have been other changes checked into foo by another dev. I want to do a diff between my WC and the upstream state of foo. Normally, when working in the trunk (HEAD), I just do a cvs diff, and that's fine. But for some reason when doing a plain cvs dif...
So far I've been happily using thunderbird to browse through svn commit messages using the Colored Diffs plugin. However now I have to use Outlook (don't ask...), and I could not find an equivalent add-on. Is there one? Thanks PH ...
I have several config files in my .net applications which I would like to merge application settings elements etc. I was about to begin doing it manually as I usually do, however thought there must be an XML diff GUI tool available somewhere. The tool would be able to go to the element level to compare and display the differences etc....
How do I diff two files in MSBuild? I cannot find any specific task to do it. If possible, is it also possible to exclude certain rows, or patterns in the files eg. 2009-12-09T10:03:07.6888125+02:00 ...