Is there a way to configure hg com so that in the commit message file that pops up in the external editor, instead of just showing which files were changed (in the HG: lines) it actually shows the full diff? I'd rather view the output and compose my commit message simultaneously from the comfort of my text editor as opposed to doing hg ...
Say I've got a directory full of html pages. Their headers and footers are basically the same, but I want to be able to see only the portions of all the pages that are the same. I'd like to call it an n-way merge, but that isn't what it is, it's looking for just the similarities between the header and the footers of all the files. (an...
I started using diffuse, which you can use to compare multiple files together with, but it's some what useless since you can't horizontally compare lines when you have like 20 files you need to compare together, I was thinking maybe one line from all twenty files displayed horizontally. ...
Does anyone know of a good c++ library that can provide a line-based unified diff? ...
What is a good tool to see the differences between 2 tables (or even better, the datasets returned by 2 queries). EDIT: I'm not interested in the schema changes. Just assume that the schemas are the same. background as to why: I'm porting some legacy code which can fill a database with some pre-calced data. The easiest way to see if I ...
So in SVN you can do things like: svn merge -r555:558 svn diff -c551 but (as far as I know) there is no way to do: svn merge -r555:558, 592:594 svn diff -c551, 557, 563 For merges you can always just do several commands in sequence: svn merge -r555:558 svn merge -r592:594 but for diffs doing that will just result in multiple dif...
Hi all, I've done some searching for this but cannot find what I'm after, specifically. I have two files: "a.txt", "b.txt". Each contains a list of email addresses, separated by newlines. For all lines in "a.txt", I need to check for a match anywhere in "b.txt". If so, the email address in "a.txt" needs to be removed. (Alternativel...
I'd like to align two lists in a similar way to what difflib.Differ would do except I want to be able to define a match function for comparing items, not just use string equality, and preferably a match function that can return a number between 0.0 and 1.0, not just a boolean. So, for example, say I had the two lists: L1 = [('A', 1), (...
Hello ! I duplicated some folder with project's config to a new project a few days ago and made there some modifications (project name, paths, etc). After few days a source config dir has changed and I am wondering how to diff that folders in 2 projects to apply that changes in new project. If I select source file and then new file and...
What is a good method for using diff to show a percentage difference between two files? Such as if a file has 100 lines and a copy has 15 lines that have been changed the diff-percent would be 15%. ...
I'm looking for a way to determine the differences between two strings, and highlight them in both strings. I would suspect that most 'diff' libraries won't work since they show differences in lines (I believe). Either an algorithm or library will work. Thanks, Mark ...
I want to compare the a list of files in two directories quickly. I can use the following $ ls /opt/myapp/ >> ~/myapplist $ cksum ~/myapplist 3476215496 7657 /u/compll07/ojblass/myapplist $ ls /opt/myapp2/ >> ~/myapp2list $ cksum ~/myapp2list 3476215496 7657 /u/compll07/ojblass/myapp2list And compare the ...
Hello, I have a code directory structure, which is this: modudle1 trunk pom.xml branches 1.1 pom.xml modudle2 trunk pom.xml submodule-2.1 pom.xml submodule-2.2 pom.xml branches 1.1 pom.xml submodule-2.1 pom.xml submodule-2.2...
I have the source for a DLL and I have a compiled version of it lying around somewhere. If I compile the source it will have a different date to the already-compiled version. How can I tell whether they are in fact the same and have merely been compiled at different times? ...
After reading through this question about Ruby diff packages, I'm still not sure how to generate a unified diff from two text files. I'm not having trouble reading each file into a string (IO.read()), but I'm not finding any package that can generate a unified diff. Does one exist? Is doing a system call to diff even an option I should c...
How can I diff two files and ignore lines starting with a sequence. E.g File1: abc def time:123 File2: igh def time:345 With unix diff it will report <time:123 >time:345 I want to ignore this diff. Any ideas? ...
I have two versions of a piece of text and I want to produce an HTML view of its revision similar to what Google Docs or Stack Overflow displays. I need to do this in Python. I don't know what this technique is called but I assume that it has a name and hopefully there is a Python library that can do it. Version 1: William Henry "...
I have these two files File: 11 11 456123 File: 22 11 789 Output of diff 11 22 2c2 < 456123 --- > 789 Output to be < 456123 > 789 I want it to not print the 2c2 and --- lines. I looked at the man page but could not locate any help. Any ideas? The file has more than 1000 lines. ...
I have subversion 1.6.5 client and 1.5.4 server. And I mostly only care about diffs on fully repository paths, not working copies. When diffing branches, ones that have been merged already show up as identical except for the mergeinfo properties. This is a touch annoying for a human who has to then look through the changes looking for ...
Is there a way to get the changes of two commits with mercurial? The second commit is not directly after the first one, there are some other ones between them. I tried hg diff [some params] --change xxxxx --change yyyyy > file.patch but that only includes the last changeset. If there is no way to achieve this with hg, is there maybe...