Possible Duplicates: C# compare algorithms Any decent text diff/merge engine for .NET ? The question title pretty much says it all. I'm looking for a way to programmatically diff two text files. ...
Is there a way, short of actually checking out the parent commit, to determine a submodule's SHA-1 commit ID based on a commit ID in the parent clone? I know I can find the currently associated SHA-1 with 'git submodule'. Here's an example: I have a clone with a single submodule 'foo' that has changed several times in the last month. I ...
Hi, I have to convert a lot of legacy SQL queries to stored procs (rewriting and tidying) and I'm looking for an efficient way to compare the results one by one to ensure I haven't modified the behaviour. I currently use SQLDelta but it requires me to pipe the results of each query into tables and transfer one to a separate server usin...
Hello all, I have to see a difference between 2 states of the same DB (MS SQL 2008). Profiler is not an option as it is run-time tool and needs operator actions. I have not found tools for this purpose, so the question is - is there a way to export DB data into human-readable text format to compare them with something like windiff? Re...
I'm working on a project where Subversion is used to maintain version control. I use TortoiseSVN to access the project repository. Some changes were made between two revisions on a project (let's call them rev1 and rev2), and I want to be able to apply these changes to a working copy somewhere that temporarily does not have access to th...
We can use hg in -vp to compare our local repo to the master repo. How can you do this visually? We use the ExamDiff extension as our Mercurial visual diff tool. We figured there was a way to do the equivalent of hg in -vp but wasn't sure how to do this. ...
Is there way in svn diff or any other tool(linux based) to show only whitespace/tabs changes ?. Purpose, I dont want those diffs to be checked in. I can put back those lines to same state before check in if a tool could catch those diffs. Thanks, ...
Let's say I've checked out revision 10 of hello.c which is the latest one in the repository. I've made some changes to hello.c locally in my workspace, but I haven't committed it yet. Now, how can I compare this local uncommitted changes made on top of revision 10 with, say, revision 7 of hello.c in the repository? Thanks for your time!...
How does the patience algorithm differ from the default git diff algorithm, and when would I want to use it? ...
Hi. Is it possible to add a full directory via diff and patch? It seems as very convenient way to add additional modules on top of standard code-base. I googled for some solutions, but they generally work on file level, not on directory level. Thanks. ...
Hello, I am writing a PHP script that needs to interpret Diff files as created by Git. How should I proceed if I want to parse the Diff file and basically print it in a completely different format? I have come across the Text_Diff PEAR library, but that one only creates the Diffs itself. Or rather, it only takes two different files as ...
I am currently playing around with parsing diff files, and have yet to come across a solid documentation on diff files. I am especially interested in specifications. E.g. I don't really understand the lines that look like this (at the beginning of each changed code block): @@ -296,7 +296,8 @@ I know they have to do with line numbers,...
As part of a larger project, I want the ability to take two bodies of text and hand them to a merge algorithm which returns either an auto-merged result (in cases where the changes are not conflicting) or throws an error and (potentially) produces a single text document with the conflicting changes highlighted. Basically, I just want a ...