I have around 50 relevant commits on my local git repo, of this list I want to show in a code review only my commits. But they are mixed with other people commits, and some of my commits are corrections to others, so I don't want to go commit by commit because I would step twice in the same code, for the original and for the correction. ...
I have a mysql database. What I'd like to do is perform an arbitrary action on it, and then figure out what changed. Something like this: //assume connection to db already established before();//saves db state perform_action();//does stuff to db diff();//prints what happened I'd want it to output something like: Row added in table_0...
Currently for merges without conflicts gitk shows no diffs. Is it possible to have the diffs resulting from a merge (which are indeed there, e.g. git diff HEAD~1 after the merge shows these diffs) shown by defautl, e.g. using a command line switch? Or why does gitk by default not show them? ...
It looks like hg out --patch or hg out -p is a good way to see what code is pushed out to the repo (when it is pushed)... but the diff is in text format. Is there a way to make it use kdiff3 as well? ...
I have tried. My working copy is based on but a modified version of svn://foo.net/svn/repo/branch/yyy I want to diff against branch xxx. I have tried svn diff --old=svn://foo.net/svn/repo/branch/xxx --new=. but that only seems like shorthand for svn diff --old=svn://foo.net/svn/repo/branch/xxx --new=svn://foo.net/svn/repo/bran...
Possible Duplicate: Do you know of any language-aware diffing tools? Hey Guys I am after a differencing tool that supports the following Ignore all white spaces Has option to show differences only Can ignore comments Can do File and Folder compares Would prefer an open source solution Cheers ...
Currently my program updates itself by downloading the latest .tar.gz file containing the source code, and extracting it over the current directory where the program lives. There are 2 "modes" of update - one for users running the Python source, and one if the user is running the program as a Windows exe. Over time my program's filesiz...
After finding the difflib.SequenceMatcher class in Python's standard library to be unsuitable for my needs, a generic "diff"-ing module was written to solve a problem space. After having several months to think more about what it is doing, the recursive algorithm appears to be searching more than in needs to by re-searching the same area...
After finding the difflib.SequenceMatcher class in Python's standard library to be unsuitable for my needs, a generic "diff"-ing module was written to solve a problem space. After having several months to think more about what it is doing, the recursive algorithm appears to be searching more than in needs to by re-searching the same area...
Say I get a patch created with git format-patch. The file is basically a unified diff with some metadata. If I open the file in Vim, I can see which lines have been modified, but I cannot see which characters in the changed lines differ. Does anyone know a way (in Vim, or some other free software that runs on Ubuntu) to visualize per-cha...
I've got a diff e-mail sending using Git's post-receive e-mail hook (thanks to this SO post) but the e-mail that it sends is just plain text. I'd like something a big more colorful and well formatted. Is there a script or something I can run using the post-receive hook that will send a nicely formatted diff e-mail instead of the plain t...
Hi, Is there any tool out there which enables me to see differences between different versions in git? and the differences is shown in-line in a file? E.g. like the way eclipse shows 2 files differences? Thank you. ...
Hello - I have three directories. I would like to compare directory1 with directory2, then take those changes/new files and copy them over to directory3. Is there an easy way to do this, maybe by using linux diff and cp commands? I'm open to ideas. Thanks! Andrew ...
I'm looking for research papers or writings in applying Longest Common Subsquence algorithm to SQL tables for obtaining a data diff view. Other sugestions on how to resolve a table diff problem are also welcomed. The challenge being that SQL tables have this nasty habit of geting rather BIG and applying straightforward algorithms designe...
Hi I know that a diff between two tags lists the 'files' which have been changed between those two tags by the following method. svn diff tag1 tag2 |grep Index: Is there any property in Subversion or some technique to find out revision numbers which caused those files to change (i.e differences between tag1 version of the file and...
Hi, I know it is common to use catch when executing commands that may return non-zero... but how can I get the output in that case? To be specific, I wish to do something like "catch {exec diff fileA fileB} ret". The files are different and ret value is 1. What I actaully need is the output of diff, the detailed differences. But I bel...
In order to view changes or diffs between commits, i use the following from the command line: svn diff -r 3000:3025 > daychanges.diff I want to modify the command so that it generates diffs between successive commits, concatenates them and outputs to file, something like svn diff -r 3000:3001 > daychanges.diff svn diff -r 3001:3002 >...
On my Windows box, I tried to create a Subversion patch by using the command svn diff > my_patch.diff. The resulting file was encoded with UTF-16, rather than UTF-8 or ASCII, so when I tried to use patch (from GnuWin32) to apply the patch, it didn't work. I was able to convert the patch file to UTF8 by opening it in Notepad and saving ...
I have about 40 'themes' that have each been copied and pasted from a 'default' theme and been modified uniquely. As time has gone on each of these themes has taken a shape of its own, some more, some less. I need to be able to do an @import url(default.css); so that when I make changes to the default I do not need to cascade it down to...
I'm looking for a tool that will give me a high level view of which files are different between two fairly large Java packages. If I could then drill down into individual files then that would be good. I don't want to go file by file if possible.. any ideas? thanks ...