Re: state of the 2.6.13 transition

On Tue, 2005-09-20 at 16:14 -0700, Matthew Reimer wrote:
> One more detail: I think the breakage relates to files that exist only on the 
> vendor branch; i.e., files that we haven't modified from upstream.

Yeah, exactly.  This all stems from the fact that CVS only tracks
changes on a file-by-file basis: it doesn't have any understanding of
the relationships between different files.

CVS considers the HEAD to be a derivate of the vendor branch, which is
reasonable enough in itself.  Unfortunately, the way it implements this
is that, for files that have never been modified in our tree, the tip of
the vendor branch "shows through" into the HEAD.  So, when you check out
the HEAD, you will get some files from the actual trunk, and some files
from the vendor branch.  If there has been an import into the vendor
branch but no corresponding commit to the trunk, this will give you a
mismatched set of sources.

p.