lkml.org 
[lkml]   [2006]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: Git training wheels for the pimple faced maintainer
    Date
    On Oct 20, 2006, at 02:26:49, Pierre Ossman wrote:
    > Andrew Morton wrote:
    >> Just send me the url&branch-name for a tree which you want
    >> included in -mm.
    >> I typically pull all the trees once per day. I usually won't even
    >> look at
    >> the contents of what I pulled from you unless it breaks.
    >>
    >> IOW, -mm is like a tree to which 70-odd people have commit
    >> permissions,
    >> except it's 70 separate trees and I independently jam them all
    >> into one
    >> tree daily.
    >>
    >
    > So, in other words, you have no issues with a lot of merges in the
    > branch you're pulling from? Do you do a fresh pull each time or do
    > you update an existing copy? If you do the latter, then I assume it
    > is critical that my "for-andrew" branch has a continous history?
    > (Which it won't naturally have as the changes will be replaced by
    > identical changes coming from Linus' tree)

    I seem to remember Andrew saying something like (paraphrased) "In the
    event that your tree doesn't have a continuous history for whatever
    reason, I'll just pull a fresh copy and work from there". Given that
    he maintains -mm as a quilt patchset and only uses GIT for incoming
    pulls, I would guess that either way is probably OK, although the
    continuous history makes merging and fixing rejects mildly nicer.

    Cheers,
    Kyle Moffett
    -
    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: 2006-10-20 08:39    [W:4.474 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site