Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes:
> Just curious do you know about https://github.com/trast/tbdiff ? If
> not it might have a high overlap with what you're doing.
Yes, that is a very good suggestion. You'd need to be able to
actually apply the patches but the way I often do a review is very
similar to (actually, I'd say it is identical workflow) Laszlo's,
and it goes like this:
$ git checkout topic ;# previous round
$ git checkout master... ;# check out the fork point of previous one
$ git am mbox ;# apply the updated one
$ git tbdiff ..@{-1} @{-1}..
With the second step, the commit immediately before the previous
round of patches were applied to is checked out as a detached HEAD,
and then with the third step, the updated patches are applied.
After these two steps, the history leading to HEAD is the latest
patches, and the history leading to topic (which can be referred to
as @{-1}, i.e. the branch we were previously on) is the previous
round.
"git tbdiff" takes two ranges and compares these two series of
commits. The first one says "commits included in the branch we are
previously on (i.e. topic), excluding the ones on the current HEAD",
which means "the patches from the previous round", and the second
one says "commits included in the current HEAD, excluding the ones
on the previous branch (i.e. topic)", which means "the patches from
this latest round".
After that, I may conclude
$ git checkout -B @{-1}
to update the tip of 'topic' with the latest set of patches (the
reason why I type @{-1} is because that can stay constant in the
workflow, no matter what the actual topic branch is called).
