diff

Short version When I compare two forks on Github, it does not compare the latest states, but the current state of the base fork with the last common commit (or am I wrong?); so how can I compare the latest states/heads on Github? Longer version I am trying to compare two repositories on Github. It does not seem to compare the latest states of both repository. Instead, it compares: the base fork as it was when both repositories where identical (last common commit?) with the head fork as it is now. You can see this in the Github's fork comparison example , it says there are no changes between

Working with numpy.diff function, suppose this simple case: >>> x = np.array([1, 2, 4, 7, 0]) >>> x_diff = np.diff(x) array([ 1, 2, 3, -7]) How can I get easily x back to original scale not differenced? I suppose there is something with numpy.cumsum() . Concatenate with the first element and then use cumsum - np.r_[x[0], x_diff].cumsum() For concatenating, we can also use np.hstack , like so - np.hstack((x[0], x_diff)).cumsum() Or with np.concatenate for the concatenation - np.concatenate(([x[0]], x_diff)).cumsum() 来源： https://stackoverflow.com/questions/43563241/numpy-diff-inverted-operation

I've got a Git repo from which I need to create a patch file in something other than the default git diff format. My use case is I've got a clunky old OSF/1 machine on which I need to apply the patch, and the /bin/patch program there doesn't understand unified diffs. If I use GIT_EXTERNAL_DIFF=diff , hoping that I can then use GIT_DIFF_OPTS=-c to request a context format diff, then my (modern) diff program complains about extra arguments on its command line: diff: extra operand `373e5907b789a1398a91f4ceb4ab14e8a0ed4282' diff: Try `diff --help' for more information. external diff died, stopping

How can I diff two files and ignore lines starting with a sequence. E.g File1: abc def time:123 File2: igh def time:345 With unix diff it will report <time:123 >time:345 I want to ignore this diff. Any ideas? nc3b How about: diff -I '^time.*' file1 file2 ? Please not it doesn't always work as expected as per diffutils manual: However, -I only ignores the insertion or deletion of lines that contain the regular expression if every changed line in the hunk (every insertion and every deletion) matches the regular expression. In other words, for each non-ignorable change, diff prints the complete

I am trying to get the diff between two nearly identical tables in postgresql. The current query I am running is: SELECT * FROM tableA EXCEPT SELECT * FROM tableB; and SELECT * FROM tableB EXCEPT SELECT * FROM tableA; Each of the above queries takes about 2 minutes to run (Its a large table) I wanted to combine the two queries in hopes to save time, so I tried: SELECT * FROM tableA EXCEPT SELECT * FROM tableB UNION SELECT * FROM tableB EXCEPT SELECT * FROM tableA; And while it works, it takes 20 minutes to run!!! I would guess that it would at most take 4 minutes, the amount of time to run

I want to provide a diff report for a non regression test. My program is Java based but I did not found any API filling my needs. So I'm using an external tool (CSDiff) that take 2 files as arguments and return an HTML report. That's nice and easy to setup. Now the only problem I have is that the HTML report needs some tweaks to be used and I am messing around with the report, trying to transform it into something different (hidding some parts, changing the style, ...) Does someone know a diff tools that has a powerful command line support, allowing custom report to be generated ? Nice report

To diff we use: hg diff -c <xyz> : Show diffs for a given changeset hg diff -r <xyz> : Show all diffs since a given changeset But let's say you have changesets 4-5-6-7-8 where changesets 4, 6, 8 were related to a particular area of the system and in one diff you wanted to see the changes made from JUST these three changesets, how would you do this? If file A was modified in changeset 4 and 8, the diff would show the difference between changeset 3 and 8. If changesets 4,5,6,7,8 are linear in history I don't think that even with revsets you can do that using just -r . However, if the changes in