diff

Comparing two .jar files

走远了吗. 提交于 2019-11-28 02:52:19
How do I compare two .jar files? Both of them have compiled .class files. I want the difference in terms of method changes, etc. JAPICC , sample usage: japi-compliance-checker OLD.jar NEW.jar Sample reports for log4j: http://abi-laboratory.pro/java/tracker/timeline/log4j/ PkgDiff , sample usage: pkgdiff OLD.jar NEW.jar See sample report for args4j. Clirr , sample usage: java -jar clirr-core-0.6-uber.jar -o OLD.jar -n NEW.jar Rename .jar to .zip Extract Decompile class files with jad Recursive diff If you select two files in IntellijIdea and press Ctrl + D then it will show you the diff. I use

JavaScript based diff utility [closed]

可紊 提交于 2019-11-28 02:50:52
I'm looking for a diff equivalent written in JavaScript that only returns/prints relevant lines. I don't want both full text displayed next to each other with the differences highlighted, but just want the actual differences (plus some buffer lines to know where the difference is), similar to the output from the linux diff utility. Does anybody know a javascript function that does this? All differences should be recognized (even changed whitespace). Thanks. jsdifflib inline mode comparison, try tweaking the context size to display just the desired window of change you want. There's a demo here

How can I generate a git diff of what's changed since the last time I pulled?

故事扮演 提交于 2019-11-28 02:46:55
I'd like to script, preferably in rake, the following actions into a single command: Get the version of my local git repository. Git pull the latest code. Git diff from the version I extracted in step #1 to what is now in my local repository. In other words, I want to get the latest code form the central repository and immediately generate a diff of what's changed since the last time I pulled. You could do this fairly simply with refspecs. git pull origin git diff @{1}.. That will give you a diff of the current branch as it existed before and after the pull. Note that if the pull doesn't

Want to exclude file from “git diff”

最后都变了- 提交于 2019-11-28 02:41:05
I am trying to exclude a file ( db/irrelevant.php ) from a Git diff. I have tried putting a file in the db subdirectory called .gitattributes with the line irrelevant.php -diff and I have also tried creating a file called .git/info/attributes containing db/irrelevant.php . In all cases, the db/irrelevant.php file is included in the diff as a Git binary patch. What I want is for the changes to that file to be ignore by the diff command. What am I doing wrong? Mr_and_Mrs_D Omg, drivers and awk to exclude a lousy file ? Since git 1.9 something you can: git diff -- . ':(exclude)db/irrelevant.php'

How to see the changes in a Git commit?

青春壹個敷衍的年華 提交于 2019-11-28 02:30:33
When I do git diff COMMIT I see the changes between that commit and HEAD (as far as I know), but I would like to see the changes that were made by that single commit. I haven't found any obvious options on diff / log that will give me that output. Nevik Rehnel To see the diff for a particular COMMIT hash: git diff COMMIT~ COMMIT will show you the difference between that COMMIT 's ancestor and the COMMIT . See the man pages for git diff for details about the command and gitrevisions about the ~ notation and its friends. Alternatively, git show COMMIT will do something very similar. (The commit

What is the diff version git use? diff2 or diff3?

不想你离开。 提交于 2019-11-28 01:40:42
问题 Does anyone has clue which is the diff version used by git? This article for example explain in details the diff algorithm for dummies but whats is the actual algorithm which is used? For general knowledge here specs for diff2 & diff3 . diff2 : http://www.xmailserver.org/diff2.pdf diff3 : http://www.cis.upenn.edu/~bcpierce/papers/diff3-short.pdf I know you can configure git to use diff2 or diff3 git config --global merge.conflictstyle diff3 回答1: You seem to be confusing 3 different things The

xml diff in ruby? [closed]

不想你离开。 提交于 2019-11-28 01:05:44
问题 What is the best/fastest way to merge two xml documents with ruby? I have two xml files, one that's formatted so it is visually appealing, one that isn't (and it has comments and whitespaces stripped) that has a few changes to some of the nodes throughout, and it gets changed often. So I'm trying to figure out a simple and efficient solution to check what's changed (they may not all have IDs), and merge the old document with the formatted document. 回答1: Ara Howard posted a snippet a few

Use a different diff command with CVS?

筅森魡賤 提交于 2019-11-28 00:39:53
问题 Is it possible to use a different diff program with CVS? I'd like to use something like meld to give me a side-by-side graphical view of the repository and my changes. It's out of my control to use a different CMS. What would be ideal is some undocumented command line argument that would work like this: cvs diff -prog /usr/bin/meld foo.cc This would give me a diff of my checked out, modified version of foo.cc with the repository version, but using the diff program meld. I realize an

In the context of git (and diff), what is a “hunk”

拟墨画扇 提交于 2019-11-27 23:03:53
I was looking for a definition of "hunk" while reading some git documentation. I know it means a description of the difference between two files and that it has a well defined format, but I couldn't call to mind a succinct definition. I tried searching with google, but there were a lot of somewhat spurious hits. And eventually I found this: When comparing two files, diff finds sequences of lines common to both files, interspersed with groups of differing lines called hunks. here: http://www.gnu.org/software/diffutils/manual/html_node/Hunks.html Which was exactly the kind of succinct definition

git gui - can it be made to display UTF16?

倾然丶 夕夏残阳落幕 提交于 2019-11-27 22:39:12
问题 Is there any way to make git gui display and show diffs for UTF16 files somehow? I found some information, but this is mostly referring to the command line rather than the gui. 回答1: I have been working on a much better solution with help from the msysGit people, and have come up with this clean/smudge filter. The filter uses the Gnu file and iconv commands to determine the type of the file, and convert it to and from msysGit's internal UTF-8 format. This type of Clean/Smudge Filter gives you