On Friday, 8 March 2013 at 12:58:56 UTC, Andrei Alexandrescu
wrote:
On 3/8/13 3:33 AM, Dmitry Olshansky wrote:
There is got to be more effective process to merge stuff.
Current
situation involves ping-pong between commiter/reviewer and
contributor
on every minor nit there is. That basically involves reviewing
the same
exact code few times over as cleanup arrives some days later.
And even
when contributor think he did cleanup something, he/she may as
well miss
what's the deal and the cycle repeats.
Instead it's definitely possible for committer to checkout the
pull, do
an extra cleanup commit (with automatic tool possibly, like
detab/toln
and I'd love to see official "indent" for D) and push it to
the main
repo. (Or squash the commits. This doesn't cancel out
reviewing anything
non-trivial by at least 2 persons.)
We could experiment with this, but I'm skeptical. At Facebook
we have that option (called "commandeering" a revision) but
it's very rarely used.
One issue that I do think is holding us back is the diff
viewer. Phabricator has a great one (side by side, not
interleaved), and it would be great if we could have the same.
One possibility would be to integrate smoothly with meld.
Andrei
git difftool?
