I'm looking for a diff/compare tool that shows differing lines from two text files, and gives me a space to comment on those files. Ideally this application would have three panes, pane one would be file A, pane two would file B and pane three would be a comment I can enter to on why the files are different. We're going to be using this...
I'm trying to recursively compare two subversion working copy folders using WinMerge. Unfortunately, WinMerge displays lots of differencing files inside of the subversion control folders (.svn or _svn). Is it possible to somehow exclude the subversion folders from the comparision? Or is there another (free) diff-tool which is able to d...
Is there a diff tool for viewing differences in XIB's? It could display what graphical elements are in one xib while missing in other? ...
I googled and couldn't find any could that would compare a webpage to a previous version. In this case the page I'm trying to watch is link text. There are services that can watch a page, but I'd like to set this up on my own server. I've set this up as a wiki so anyone can add to the code. Here's my idea Check if previous version ...
I'm trying to setup a particular workflow but having trouble figuring out how(or if) rsync will work for this. My setup is on Mac OS X. I have my SVN directory. When I run my deploy script, the files are moved over to my integration Apache server. I perform my modifications to the files, then manually have been copying them back to SVN...
Hello everyone, I've got data being read into a data frame R, by column. Some of the columns will increase in value; for those columns only, I want to replace each value (n) with its difference from the previous value in that column. For example, looking at an individual column, I want c(1,2,5,7,8) to be replaced by c(1,3,2,1) w...
Basically, I'm not looking for specific differences as you would get with a normal diff algorithm, I'm looking more to generate some sort of numeric value which represents the level of difference of two blocks of text so that I can take a bunch of different text blocks and extract a set of those text blocks that qualify as being sufficie...
I want to implement word document differ, what algorithms does it requires to implement? ...
Do you intermingle refactoring changes with feature development/bug fixing changes, or do you keep them separate? Large scale refactorings or reformatting of code that can be performed with a tool like Resharper should be kept separate from feature work or bug fixes because it is difficult to do a diff between revisions and see the real ...
What is the best/fastest way to merge two xml documents with ruby? I have two xml files, one that's formatted so it is visually appealing, one that isn't (and it has comments and whitespaces stripped) that has a few changes to some of the nodes throughout, and it gets changed often. So I'm trying to figure out a simple and efficient so...
I want gitweb to output the same diff format as git diff --color-words. Does anybody know how I can do this? I looked at HTML::FromANSI but couldn't get it working with git diff --color-words from the command line. ...
My goal is coming up with a script to track the point a line was added, even if the line is subsequently modified or moved around (both of which confuse traditional vcs 'blame' scripts. I've done some minor background research (see bottom) but didn't find anything useful. I have a concept for how to proceed but the runtime would be atr...
I need to compare two strings and output the diff in HTML (similar to MS Word "track changes"). Language is C#, this is (not surprisingly) a .NET web app. There are a few similar questions (like this one for PHP/Python), but no existing question on SO. I don't need a finished project, just anything that will cut out the extra work. ...
I'm working on application sending changed files to other computers. Currently a changed file is sent completely even if the change is minor. I'm looking for a library (C,C++,Java) that would allow me to create a binary diff and send only the delta and the matching patch to merge the data back. I'm looking for something ideally under an...
I had a private branch that I did a ton of commits to, then I merged it into trunk, and did a few little tweaks there. Now the trunk maintainer wants a diff off all of my changes incase we need a rollback. How can I create this? If you need numbers for your examples, assume that 224446 was my main revision where I merged into trunk, ...
What's the easiest way to see the difference between two xml files using? I looked into Hpricot and Nokogiri but couldn't find any good comparison methods. I've also looked into unix tools like diffxml, but would rather use something in ruby. Anybody got any ideas? ...
Hi all, I need to work with large files and must find differences between two. And I don't need the different bits, but the number of differences. For the differ rows I come up with diff --suppress-common-lines --speed-large-files -y File1 File2 | wc -l And it works, but is there a better way to do it? And how to count the exact ...
I have two chunks of text that I would like to compare and see which words/lines have been added/removed/modified in Python (similar to a Wiki's Diff Output). I have tried difflib.HtmlDiff but it's output is less than pretty. Is there a way in Python (or external library) that would generate clean looking HTML of the diff of two sets...
When I use 'svn diff' from the command line, it prints out the lines that have changed but also the 3 unchanged lines before and after for context. I much prefer seeing only the changed lines with no context. I haven't been able to determine any command line options that will let me make it behave this way. Standard 'diff' and 'cvs diff'...
I'm bad dumb and having no google fu. How do you get diff (on os x if it matters...) to look like svn diffs? Couldn't figure it out from the man page either. :( What I want Index: test.txt =================================================================== --- test.txt (revision 365) +++ test.txt (working copy) @@ -1,7 +1,9 @@ This ...