It also means that your rate of change in a single area is limited to
the output of one human being. Either the human doing the work or
the human doing the merging. So far, it seems more like nobody is
doing any merging, Dave says someone does but nobody else has spoken
up and I tend to think that merging is not a common process in the
Linux tree, the rate of change sort of indicates that. I suspect
that people avoid merge conflicts because they hurt, because of
the poor tools.
"Docter it hurts when I have to merge"
"So don't do that."
Single threading development is fine, it has benefits, but it also
has costs. It's a tradeoff.
No commercial software firm would but up with a development process
which caused that to be the case. They may want it to be the case,
but they want to be able to choose. We used to have pretty good merge
technology, much better than CVS, and we still got beat up all the time
about it until we made it what it is today.
The point there is that if commercial firms coordinated the merging by
hand, either by doing it by hand or avoiding it by hand - one of which
has to be true in the Linux development community - then we would have
never heard a word about our merge technology. In this respect, the
commercial shops are way way ahead of Linux. They can choose to work
like Linux does, that's an option, and yet they don't. It's way too
time consuming for little or no gain. You should think about that.
They learn from you, they're cherry picking your best stuff, what are
you getting from them?
There are others out here who have worked at big OS shops, they can
back this up. Hey, Pete, what would happen at Sun if they took
filemerge away? How long do you think that would last?
I can also tell you that your description does not at all match what
is happening in the Linux/PPC development nor the MySQL development.
They have merge conflicts all the time and we have years of data to prove
it. If you would like the exact numbers for the PPC tree, for example,
I can give them to you. I can also give you numbers for BK itself;
we're a small team but we have merge conflicts daily. We wouldn't
make any progress if we were all waiting on each other all the time.
Nor would we be able to support the code if only one person got to work
on a particular area; that's a dangerous approach, it means that you are
dependent on that one person. I can see it for Linus, he's sort of Mr
Good Taste, but I can't see it making sense for particular sections of
the code. Each section should have at least two active experts.
The point is that while you may live in a world where merging is rare,
but I suspect that's almost certainly caused by poor tools. If that
weren't the case, can you explain why when the PPC team moved over to BK,
we saw lots of merge conflicts? BK didn't make those up, they reflect
what the people did faithfully.
----- Larry McVoy lm at bitmover.com http://www.bitmover.com/lm - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to firstname.lastname@example.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/