Все вопросы: [diff]

286 вопросов

4
голосов
4ответов
6193 просмотров

How to use beyond compare as a external svn diff tool

I want to configure it so that svn diff filename shows the diff in beyond compare. I am on ubuntu. On a related note what is everyone using to diff and merge. BC is awesome on windows, but very ugly looking on Linux, imo.

6
голосов
4ответов
2919 просмотров

how to determine if webpage has been modified

I have snapshots of multiple webpages taken at 2 times. What is a reliable method to determine which webpages have been modified? I can't rely on something like an RSS feed, and I need to ignore minor noise like date text. Ideally I am looking for a Python solution, but an intuitive algorithm ...

2173
голосов
14ответов
852727 просмотров

How do I show the changes which have been staged?

I staged a few changes to be committed; how can I see the diff of all files which are staged for the next commit? I'm aware of git status, but I'd like to see the actual diffs - not just the names of files which are staged. I saw that the git-diff(1) man page says git diff [--options] [--] […] T...

18
голосов
3ответов
5263 просмотров

howto make diff look like svn 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...

16
голосов
4ответов
7804 просмотров

How to get NO context when using svn diff

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 behav...

30
голосов
7ответов
28799 просмотров

Generate pretty diff html in Python

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 ...

49
голосов
7ответов
63485 просмотров

How to count differences between two files on linux?

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. To find the number of different rows I come up with diff --suppress-common-lines --speed-large-files -y File1 File2 | wc -l And it works, but is there a ...

5
голосов
4ответов
2798 просмотров

Diff two XML doc in Ruby?

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?

34
голосов
2ответов
26708 просмотров

SVN: Create a diff for lots of revisions

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...

9
голосов
2ответов
4279 просмотров

Binary diff algorithm for commercial software

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. ...

3
голосов
2ответов
877 просмотров

Any existing C# code (OSS) that will calculate diff between two strings and output html?

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 an...

4
голосов
2ответов
637 просмотров

Is there a diff algorithm that preserves line ownership

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 h...

2
голосов
1ответов
873 просмотров

How do I change the Gitweb default diff format to `--color-words`?

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.

5
голосов
9ответов
4542 просмотров

xml diff in ruby?

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 tryi...

4
голосов
5ответов
391 просмотров

Refactoring and non-refactoring changes as separate check-ins?

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 ...

29
голосов
5ответов
13297 просмотров

How do document diff algorithms work?

I want to implement word document differ, what algorithms does it requires to implement?

1
голосов
1ответов
1373 просмотров

text comparison/difference algorithm

Is there a c# library/algorithm that compares 2 texts and displays what is different in them?

1
голосов
1ответов
154 просмотров

Given two blocks of text, how can I generate a coefficient to compare how similar they are?

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 ...

0
голосов
2ответов
1374 просмотров

Selectively replacing columns in R with their delta values

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 re...

2
голосов
4ответов
601 просмотров

Trying to get rsync to copy files back to svn

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 m...

1
голосов
2ответов
1083 просмотров

Watch a web page for changes

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. H...

2
голосов
3ответов
665 просмотров

Tool for viewing structural xib differences?

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?

114
голосов
3ответов
42073 просмотров

How to ignore SVN folders in WinMerge?

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 comparison? Or is there an...

1
голосов
1ответов
492 просмотров

Diff/Compare Tool That Lets Me Write Comments On Differing Lines

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 ar...

1
голосов
1ответов
1297 просмотров

diff and new empty files

I'm using diff -Naur to send a single patch to a customer, in order to update their snapshot of our repository. I tried using git diff -p to get a single file patch, but apparently it doesn't include new binary files in the patch I know I should have used git-format-patch, but it creates patche...

7
голосов
5ответов
5726 просмотров

Comparing local and remote files in NetBeans

Is there a way to compare local and remote (FTP) file in NetBeans? There is an upload (and download) command in NetBeans. What I want to do is to see the changes between local and remote version in built-in compare tool when I am using download and upload and ideally select which changes to appl...

32
голосов
6ответов
18494 просмотров

Is there a way to diff files from C++?

I'm looking for a C or C++ diff library. I know I can use the Unix diff tool in combination with system or exec, but I really want a library. It would be handy if the library could perform patches as well, like the Unix patch tool.

0
голосов
1ответов
80 просмотров

xslt .net and date diffs

Using .net XsltCompiled transforms, whats the best way to perform date diffs? Is defining a C# code snippet via the ms:script CDATA block "good enough"? or is moving to a different transform engine worth it i.e. Saxon?

9
голосов
1ответов
4087 просмотров

Using external diff tools with Mercurial

Anyone know how integrate ExamDiff with Mercurial? I have KDiff3 set up but couldn't figure out how to set up ExamDiff. Update: Per accepted answer, this .hgrc config worked: [extensions] hgext.extdiff = [extdiff] cmd.examdiff = C:\Program Files\ExamDiff Pro\ExamDiff.exe Can run ExamDiff ...

9
голосов
4ответов
2846 просмотров

Diff tool that ignores floating-point formats (but not values) in text?

I'm looking for a diff tool that can also compare floating point values (within some tolerance) in text files. This is in addition to typical text-comparison diff functions, with options to ignore whitespace, ignore case, etc. A GUI (or full-screen console UI) is okay, but I'd really prefer a str...