lkml.org 
[lkml]   [2011]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: nfsd changes for 2.6.39
On Wed, Mar 23, 2011 at 8:58 PM, J. Bruce Fields <bfields@fieldses.org> wrote:
>
> The diffstat generated by request-pull looked horribly wrong despite the
> individual patches looking reasonable; I assumed it was a side effect of
> the one back-merge and didn't look any closer.  Sorry, I probably should
> have looked closer or asked for help.
>
> Here you go--did I screw something up?

Yeah - the back merge. One of the bad side effects is that now you
don't have a nice clear merge base any more, but _multiple_ merge
bases (think "you mixed up your development tree with the upstream
development tree").

Now, most of the time you end up being lucky, and when git picks one
of those merge bases and tries to diff against them, it all works out
anyway, and you get a reasonable diff. But not always. Because in the
case of multiple merge bases, the only _real_ way to get a proper diff
is actually to do the merge (and let merge sort out all the
complexities) and then do the diff of the result.

But no, you didn't screw up as in "the diff is wrong" - it's just that
the diff isn't rally valid, because git tried to do a diff against the
merge base, but with multiple too choose between it just sometimes
screws up.

One more reason to try to avoid mixing development streams.

(People who do this a lot have learnt to do a private merge into a
temporary branch, and do the diff against that. I don't want to see
that merge though - just think of it as a temporary throw-away thing
just for the diff).

I'll pull.

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2011-03-24 16:23    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site