Notebook diff can be generated with nbdime. After installing nbdime you can run following to see notebook diff in browser: > nbdiff-web notebook_1.ipynb notebook_2.ipynb If you are using Github for version control you can use ReviewNB for Notebook diff. It lets you login via Github and browse commits/pull-request diff on your repo. You’ll see visual … Read more
A simple example: $ echo -e “line 1\nline 2\nline 3” > a $ sed -e ‘s/2/b/’ <a >b $ sed -e ‘s/2/c/’ <a >c $ diff a b > ab.diff $ patch c < ab.diff $ cat c.rej *************** *** 2 – line 2 — 2 —– + line b As you can see: The … Read more
run mysqldump with “–skip-opt” to get the 2 dumps files i.e: mysqldump –skip-opt -u $MY_USER -p$MY_PASS mydb1 > /tmp/dump1.sql mysqldump –skip-opt -u $MY_USER -p$MY_PASS mydb2 > /tmp/dump2.sql compare using these diff options: diff -y –suppress-common-lines /tmp/dump1 /tmp/dump2
–compare (-d) is more handy for that. tar –compare –file=archive-file.tar works if archive-file.tar is in the directory it was created. To compare archive-file.tar against a remote target (eg if you have moved archive-file.tar to /some/where/) use the -C parameter: tar –compare –file=archive-file.tar -C /some/where/ If you want to see tar working, use -v without -v … Read more
Meld is an actively-developed, open-source GUI-based diff utility targeted at developers. It is free It runs on Linux GNU License 40+ posts tagged as meld on Stack Overflow. Actively developed through February 2013 (the time of this posting) Allows two and three way comparison between files and folders Supports Subversion, Git, and Mercurial
Try this: diff -Naur dir1/ dir2/ The -u option makes the output a little easier to read. The -r option recurses through all subdirectories The -N and -a options are really only necessary if you wanted to create a patch file.
I believe that diff -u oldfile newfile > a.patch is used to create patch files, although some other switched may be thrown in as well (-N?). Edit: OK, 4 years later and finally going to explain what the switches mean: -u creates a Unified diff. Unified diffs are the kind of diffs that the patch … Read more
How to change default diff tools You can specify an external diff tool by modifying the file map, in “c:\program files\rational\ClearCase\lib\mgrs” The WinMerge suggested by Paul actually modifies that file. Each map line has 3 parts: the CC filetype, the CC action, and the application. Find the section in the map file for text_file_delta file … Read more
I think there are multiple algorithms supported because none of the algorithms are clearly the best choice in all cases. The differences are in readability of the patch output and processing time needed to generate the patch. Summarizing, this is what I understand the differences are: Myers: The original algorithm as implemented in xdiff (http://www.xmailserver.org/xdiff-lib.html … Read more
This header is called set of change, or hunk. Each hunk starts with a line that contains, enclosed in @@, the line or line range from,no-of-lines in the file before (with a -) and after (with a +) the changes. After that come the lines from the file. Lines starting with a – are deleted, … Read more