From: Junio C Hamano Date: Mon, 29 Aug 2011 20:56:35 GMT Subject: Re: [PATCH v2 1/2] check-ref-format --print: Normalize refnames that start with slashes Message-ID: <7vhb50543g.fsf@alter.siamese.dyndns.org> In-Reply-To: <20110829190118.GE756@sigill.intra.peff.net> Jeff King writes: > On Mon, Aug 29, 2011 at 02:50:12PM -0400, Jeff King wrote: > >> 3. Having better tool support for comparing two sets of commits. The >> ideal interface (to me) for this workflow would be something like: > > BTW, this discussion is obviously about comparing what was applied > upstream with what was submitted, but I think such a tool could have > other purposes, too. It should be able to provide a much nicer interdiff > between two versions of the same series (e.g., for reviewers looking at > a re-roll). I agree with it in principle, but I am not going to write one any time soon. I think the most difficult case is when the submitter based a fix on 'next' or 'pu' and I fixed it up so that it applies to 'maint'. It is not trivial to express conflict resolution in such a case, as what your tool has to do its work are (1) the original patch that may apply to "somewhere" (the tool could ask "am -3" to help it out), and (2) the patch that is queued somewhere in 'pu'.