Currently using Gettext on a project and the .po files are nicely kept under version control. PO files of course contain translations, but in addition to that they also contain some metadata - information about the exact files and line numbers where the translatable strings are located. The problem is that each time you update the PO f...
I enjoy using git diff --color-words to clearly see the words that have changed in a file. However I want to share that diff with someone without git or a colour terminal for that matter. So does anyone know of a tool or trick that can convert colour escaped terminal output into HTML? ...
What is the best way in C# to get a collection of objects representing the changes between two XML texts, e.g.: First: <Customer> <Id>1</Id> <FirstName>Angie</FirstName> <LastName>Jones</LastName> <ZipCode>23434</ZipCode> <Contracts> <Contract> <Id>234</Id> <Title>Test Contract 1</Title> </Contract> ...
Hello, I'm writing a programm in which I need to generate a diff and display the result. Is there any GUI component out there, with which I can easily accomplish this task, or do I need to hack something for myself? I'd prefer using a Swing component, but any other technology will be fine, too. ...
There seems to be many questions WRT tool to generate diffs between xmls, but there wasn't this question yet, so anyone who knows this show me a link or paste any example anyone already solved this problem. Canonicalizing an xml file means, reordering the appearance of attributes reordering the appearance of tags (selectable by comman...
I have two directories with the same list of files. I need to compare all the files present in both the directories using the diff command. Is there a simple command line option to do it, or do I have to write a shell script to get the file listing and then iterate through them? Thanks! ...
We are branching out beyond the development team and trying to get other groups within my company to use version control for important documents that need change tracking. One frequent need is for Excel spreadsheets. These are large spreadsheets, modified fairly frequently (weekly or monthly) but with only a small portion of the cells ch...
The command I'm using is: TortoiseProc /command:diff /path:myfile.txt It will open up the diff TortoiseSVN window, but it will only compare the working copy with the HEAD copy. What I want is to compare the working copy with the latest version in the Repo that is different. Basically, the same as running the right-click->TortoiseSVN-...
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 - ...
All diff tools I've found are just comparing line by line instead of char by char. Is there any library that gives details on single line strings? Maybe also a percentage difference, though I guess there are separate functions for that? ...
I have a whole bunch of pairs of files that have subtle differences. We use subversion for a source control, and I like the Merge/Diff utility that comes with TortoiseSVN for windows. And I can use this utility to manually compare/merge two files together. My question is this: How can I programmatically merge two files together the s...
Hi, I'm looking for a way to produce HTML files from a git-diff output, preferably using python. I've been looking at http://docs.python.org/library/difflib.html without being able to figure out how to use the git-diff output as an input. Any clue? Many thanks ...
$svn diff > patchfile creates a nice patchfile. However, using TortoiseSVN under Windows I've set some files as being "ignored-on-commit", that is, it is under version control but doesn't get selected, when i do a commit. TortoiseSVN seemingly handles this via a custom entry in .svn/entries for this file. Note, that it it isn't a norm...
I would like to be able to compare a binary file X to a directory of other binary files and find which other file is most similar to X. The nature of the data is such that identical chunks will exist between files, but possibly shifted in location. The files are all 1MB in size, and there are about 200 of them. I would like to be hav...
I need to know if the two patches are effectively the same. I have an old patch file and new patch file created with the unix diff command. Just diff'ing the patches reports differences due to the timestamp when the patch was created. Is there a way (with diff?) that can reliably tell me if the two patches are effectively the same? ...
Hi all -- I have two files I've been trying to compare with diff. The files are automatically generated and feature a number of lines that look like: //! Generated Date : Mon, 14, Dec 2009 I'd like those differences to be ignored, and have set out to use the "-I REGEX" flag to make that happen. However, the number of spaces that a...
Standard linux patch hard-coded only for unix text files. PS: I do no want convert ALL to unix and then convert result back. ...
Instead of running "svn diff", "hg diff" and so on .. can we write a single command that calls svn/hg/git accordingly? Can the diff output be made pretty? edit: command-line tools (not GUI) preferred. ...
I know of the Text_Diff PEAR package, but is there anything more robust? I'm looking to take diffs of strings with HTML tags in them, and I'd like to know the locations of all the differences including the tags. ...
I have two copies of an application source code. One copy is encoded, while the other is not. There are config files scattered through-out the application's directory structure, and this is what I would like to compare. Is there a way to use diff where-by I can ignore the wildly different files (ie: An encrypted file and an unencrypted ...