Are there any (ideally GUI) diff tools that are aware of syntax? As an example of the kind of thing I'm looking for, I keep finding that my current tool miss aligns repetitive code: Foo = { 'hello': 'world', | Foo = { 'hello': 'world', 'goodnight': 'moon' | 'goodnight': 'moon' } <...
Diff function on two arrays (or how to turn Old into New) Example One[]={2,3,4,5,6,7} Two[]={1,2,3,5,5,5,9} Example Result Diff: insert 1 into One[0], One[]={1,2,3,4,5,6,7} Diff: delete 4 from One[3], One[]={1,2,3,5,6,7} Diff: modify 6 into 5 in One[4], One[]={1,2,3,5,5,7} Diff: modify 7 into 5 in One[5], One[]={1,2,3,5,5,5} Diff: app...
For a given file in a Mercurial repository, how can you see the revision history? And how can you diff two revisions of the file? Ideally doing all this with visual tools (we use ExamDiff to do some other diffs). I'd say this is basic source control functionality but I can't seem to figure out how to do this with Mercurial. ...
I've been tasked to compare two XML schema files in C# and present differences between the two in an output XML document. I've researched the subject a bit to find a tool that could help me do this, but so far I've come up pretty dry. There's a dead microsoft project on the subject that actually works pretty well called XML Diff and Pat...
Are there any tools which can perform set operations (union, intersection, difference, etc) on diffs? For example, if I've got two diffs that overlap (ie, contain hunks with identical changes), I'd like to be able to do things like "get all hunks which are only in one diff" or "get all hunks which are common to both diffs". For example...
For example, if I have two files: file1: This is file 1 and file2: This is file 2 and create patch with the following command: diff -u file1 file2 > files.patch result is: --- file1 Fri Aug 13 17:53:28 2010 +++ file2 Fri Aug 13 17:53:38 2010 @@ -1,1 +1,1 @@ -This is file 1 +This is file 2 Then if I try to apply t...
I know that diff has other output modes than unified context, but I never use them. What are they and what are they useful for? ...
Hi all, looking for some suggestions please.... I would like to visually diff 2 revisions based on their svn URL on a Windows machine. I installed TkDiff but unable to get it working with svn URLs. For instance, let's suppose I want to diff yada.java revision 17 and 18, so I use the following command TkDiff svn://mysvnserver.com/code-...
I have a program where the input is a complex file and the output is a changed file but in the same format. These files are of points and connections in 3D models. I need to be able to unit test this program without checking files line by line myself for equality. Something like a version control 'diff' would be ideal in terms of viewing...
I've got a big problem but I bet it's easy to solve. I'm developing a website together with a friend using GiT for versioning control. We've just modified different parts of the same CSS file and then commited, then he pushed his commit. We're both using master branches in local and remote repository for we don't know how to deal with it...
I'm looking to implement a live diff inside a webpage that preserves whitespace. I've done something similar in the past using a combination of TinyMCE and JQuery in IE6 (required for that project) but it didn't preserve whitespace. (It wasn't supposed to, but I didn't add anything to make it do that, it just did). TinyMCE wasn't idea...
How do I tell svn not to diff certain file types when I type "svn diff"? ...
I am working on an emacs mode for a review tool, and want to use ediff for viewing diffs... the problem is that the review tool only yields a diff, rather than old and new files. I'd like to put the old file in a buffer and apply a diff rather than copying the file, calling out to diff as a subprocess and loading it into a separate buffe...
Hi, I was wondering if I can see the changes that were made to a 'file' after I have done git add 'file' That is, when I do: git add file git diff file no diff is showed... But I guess there's a way to see the differences since the last commit. Any ideas ? Thanks, A ...
Are there examples of algorithms for determining the edit distance between 2 strings when there are extra primitive operations (the standard being insert, delete, transpose & substitute a single character) which operate on a whole substring. Examples of possible extra primitive operations are: 1) The duplicate function - which copies an...
Let's say I have two files.. I want to compare them side-by-side and see what's added... anyone know? Essentially they are the SAME file. ...
I have two 3GB text files, each file has around 80 million lines. And they share 99.9% identical lines (file A has 60,000 unique lines, file B has 80,000 unique lines). How can I quickly find those unique lines in two files? Is there any ready-to-use command line tools for this? I'm using Python but I guess it's less possible to find a ...
Do You know any tools that can be used as external diff viewer for Teamcity's Visual Studio plugin? I'm using Visual Studio 2010 Pro and Teamcity 5.1.2. ...
Hi, I have two different directories and i am making a script which identify that if different directories have the same file name with different changes.i am trying with winmerge commaline option as below .. WinMergeU C:\Folder\File.txt C:\Folder2 and i also want to merge the all changes into the one file. Please suggest me on thi...
hi all I used the diff --ignore-all-space in order to ignore white spaces when I do diff file1 file2 but what I need to add if I want to ignore also line spaces (text in file1 and file2 are the same but on different lines number) because actually file1 and file2 are the same text but the text position in file1 is different from file2...