I want to be able to perform this diff before merging, including on files without merge conflicts. You just have to set up the index as you like, you never have to commit results. The way to set up for exactly what was asked, straight diffs-since-base with no merge prep, is git merge -s ours … Read more
I’m a fan of SQL DBDiff, which is an open source tool you can use to compare tables, views, functions, users, etc. of two instances of SQL Server databases and generate a change script between the source and destination databases.
a.txt: 1;john;125;3 1;tom;56;2 2;jack;10;5 b.txt: 1;john;125;3 1;tom;58;2 2;jack;10;5 Use comm: comm -13 a.txt b.txt 1;tom;58;2 The command line options to comm are pretty straight-forward: -1 suppress column 1 (lines unique to FILE1) -2 suppress column 2 (lines unique to FILE2) -3 suppress column 3 (lines that appear in both files)
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
An O(ND) Difference Algorithm and its Variations (1986, Eugene W. Myers) is a fantastic paper and you may want to start there. It includes pseudo-code and a nice visualization of the graph traversals involved in doing the diff. Section 4 of the paper introduces some refinements to the algorithm that make it very effective. Successfully … 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
After extensively looking at git help rev-parse and experimenting around, I found this piece of information: <rev1>..<rev2> Include commits that are reachable from <rev2> but exclude those that are reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults to HEAD. <rev1>…<rev2> Include commits that are reachable from either <rev1> or <rev2> but … Read more
Try the following in the shell, it will iterate each item within a collection and try to match each document based on ID. Say we have 2 collections db.col1 and db.col2: > db.col1.find() { “_id” : 1, “item” : 1 } { “_id” : 2, “item” : 2 } { “_id” : 3, “item” : … Read more
Download the latest .dmg package for Mac from here: Meld for OSX Set meld as your git difftool/mergetool by editing your ~/.gitconfig and adding the following lines, as mentioned in the above link: [diff] tool = meld [difftool] prompt = false [difftool “meld”] trustExitCode = true cmd = open -W -a Meld –args \”$LOCAL\” \”$PWD/$REMOTE\” … Read more
Run svn status. It will distinguish between modified, deleted, added, etc. svn help status has a bunch of information for you.