chiark / gitweb /
Add contrib/stg-whatchanged: look at what would be changed by refreshing.
authorYann Dirson <ydirson@altern.org>
Fri, 2 Mar 2007 21:34:28 +0000 (21:34 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 2 Mar 2007 21:34:28 +0000 (21:34 +0000)
commita3e456434ff7ab75d0cae96c22329a3262764444
tree7dd72319d5a98040a83dd2d71be2def473da06ec
parent73e3a6fff48a84a7c109d4f6d16abb30c0104804
Add contrib/stg-whatchanged: look at what would be changed by refreshing.

This script outputs a "metadiff" (diff of diffs, ie. diff between 2
versions of a single patch).  This is somewhat a proof of concept, and some
work is indeed needed in the way to present the results.  Consider
filtering the output at least through colordiff.

I have 2 uses for this script:
- when simply editing a patch, provides a 3rd way to check what I've done
  before refreshing (in addition to "stg diff" and "stg diff -r //bottom")
- most usefully, when resolving conflicts caused by a push, to ease
  checking of the merge result.

Signed-off-by: Yann Dirson <ydirson@altern.org>
contrib/stg-whatchanged [new file with mode: 0755]