After a merge failed with some conflicts I can list those with git diff, but git difftool won't display them with the difftool set in the config(in my case Kaleidoscope), instead it will just use normal diff. A git difftool comparing with a previous commit will work. Is there a way to use git difftool on merge conflicts? Greets Jan ...
I'm looking for a diff algorithm that will produce results like SO's edit revisions page. I've more or less just started looking and I'm not opposed to doing it myself but I don't need to reinvent the wheel. I'll be using C# 4.0. I'll basically have two strings, and old one and a new one. I want to know what has changed in the new ...
I want tkdiff (or something like it) to display my 'svn diff' so that I can switch files in the tkdiff interface itself. (I'm using a mac.) ...
I have a working copy of a repository on my machine, and I know that it has been updated on the server. I would like to know how to get the difference between the new version and the version in my working copy by using svn command line arguments. Is there a way for me to do this? ...
I have two text blocks, containing company names. Both contain names of hundreds of companies, the newer list has more companies. How do I remove the duplicate company names from the two lists , so that I am left with the new names only? Sample text block one: Company Name One, Address line 1, line 2, phone, email .. Random text .. Co...
In case of things that are hard to test using traditional xUnit-style methods, such as various converters, XSLT, etc. I often employ technique based on output comparison. The test program produces some output when it's run for the first time. I make sure it's correct and save it for the later use. On the following runs the program compar...
I want to a visualize web file compare tool,that can embed into my app,I know there some software like beyond compare,it has done great job,but it on windows & need buy licence,if someone has develop a web version,then it can cross platform, does some already achieve this? if it is python - friendly is great appreciated ...
How can you determine all the files that changed in a given changeset? I'm not looking for a diff in this case, just a list of add/remove/modifications. hg log -vprX does a list of diffs but I just want the files. ...
In this question: http://stackoverflow.com/questions/42980/how-to-use-p4merge-as-the-merge-diff-tool-for-mercurial, Adam Rosenfield suggested to use launchp4merge to diff multiple files in OSX such that there is only a single copy of p4v running. Is there an equivalent for linux? I ran p4v -merge -h and saw that it does not accept more ...
I have forked a project on github and need to have a set of changes I made since I forked, in diff format. If you wonder - I've forked Apache httpd and I'm changing some code in core. Currently I'm not commiting any changes, running git diff, and use its output as a patch against vanilla httpd sources in an RPM building process. It is, ...
Hi. As part of a code review, I need to review all the changes made by a single person to an svn branch. Is there a single command that can do this? Or will I have to just go through each revision marked with their name one by one. ...
Say I have too programs a and b that I can run with ./a and ./b. Is it possible to diff their outputs without first writing to temporary files? ...
I'm an experienced SVN user getting used to TFS at a new client site. The main problem I've had adjusting to the new tool is this - how can I get a listing of all files in my working copy that have changed from current/latest server revision, including added or deleted files? Essentially, I'm looking for the TFS equivalent of an "svn d...
There are a few questions related to this on SO, as well as several bug reports sprinkled throughout google searches, but --new-file or -force or --notice-ancestry has not worked for me. The file is NOT binary and I'd like something of the form to work: svn diff -r XXXXXX TestHelloWorld.java where TestHelloWorld.java is an added file...
Looking for a Ruby differencing engine. So you can do some of the same things meld viewer does. For example you have this first set of code per line: String1 String2 String3 2nd set: String1 String3 String4 The diff would come out to show lines 2 and 3 are different. I already am using this one: http://github.com/pvande/differ...
This is related to another question I recently asked about storing a non-bare repository in Dropbox for easy movement between computers, so it may be helpful to read that question for background. The gist is that the fileMode keeps reporting a diff for some number of files. I can't find a way to reproduce it consistently, but it happens...
Does anyone know of a script that can accept a raw diff file and pretty print HTML output (which would be easier to review/mail)? A google search returned me some results like http://kafka.fr.free.fr/diff2html/ However all of these scripts require two files as input (they don't even accept two directories). My diff output is the diff b...
Diff tools usually works on a line basis. That works pretty well except if 2 peoples add a new methods at the end of a file that results in a conflict , even using a 3-way diff, because system think both people tried to add something different as the place , except in that case the exact location doesn't really matter. So I was wonderi...
I have two files one file subset of other and i want to obtain a file which has contents not common to both.for example File1 apple mango banana orange jackfruit cherry grapes eggplant okra cabbage File2 apple banana cherry eggplant cabbage The resultant file, difference of above two files mango orange jackfruit grapes okra An...
I have 2 MySQL dump files. I want to find the table data difference between 2 tables. ...