Re: [linuxsh-dev] 2.4.0-test2

[NIIBE Y. <gn...@ch...>]

NIIBE Yutaka wrote:
 > I'll import 2.4.0-test2 and 2.4.0-test3-pre2 this afternoon.
 > I'm sure it results conflict.

Done.

Mitch Davis wrote:
 > The LINUS branch is the "vendor" branch onto which imports
 > of the official Linux kernel go.  The merge phase (which
 > brings Linus' changes into our kernel) works by comparing
 > old-and-new tagged revisions on the LINUS branch, and applying
 > these differences to our "main" branch.  These differences
 > are then checked in, giving us the official changes.  

Thanks for your explanation.

I should have explained more clearly.  My question is:
	Who use LINUS branch?
	If it's only for merge, I don't think it worth to have it.

It takes time (for me) to resolve the conflicts.  On the other hand,
it is *not* needed to use "merge" feature of CVS.  Just apply the
patch of Linus (except the update I sent to Linus), that's enough.

Because the import process has no knowledge of our update to the
mainstream, the import after the sending update to Linus (or Alan)
always causes conflicts, provided we don't do any special things.
--