[linuxsh-dev] Tree Management Questions

[Jeremy S. <js...@mv...>]

I've got several questions regarding management of our CVS trees,
which I haven't seen covered in any how-to-use description.  If I've
simply missed stuff in a document somewhere, please let me know.

(The context for this is that I've recently made some changes to mtd
files with dwmw2's blessing, and wanted to put them in our tree, so
this kind of details what I think I'll be doing... but here's your chance
to correct me if I'm going to do anything horribly wrong!)

(1) Of the four files to be changed, two aren't in the drop-in tree yet.
I'm assuming we expect to regularly add/drop files in common areas as
SH development proceeds, then gets put in kernel.org (or vice-versa,
if SH lags and then catches up).

(2) The MTD files are maintained by David in his own CVS; he'd like
versions in SH (or kernel.org) trees to keep keywords unchanged for
easy comparison with his tree.  Our old kernel module had -ko on all
the mtd files to do this, but I don't think the drop-in does; I will add it
for these files (and the new ones for (1) above).  [How and when to
do this should probably be covered in the developer document?]

Any objections to these?  If it's a serious problem, I don't mind just
waiting in this case for the changes to percolate from David to Linus
to SH... but certainly we need to be able to do these things smoothly.

(3) In the past few weeks I've checked in some changes; in each
case I've changed all three development lines (kernel, linux:HEAD,
linux:linux-2_4-branch) -- mainly because they're all pretty much
the same at this point, and I don't want to be the one to start the
disconnect.  Is that ok?  I don't think there have been many other
changes (which might be helpful for the next item).

(4) Chatting with one of our architects here (Marcus, I think you
know Gilbert?) about the drop-in trees, I mentioned that I'd asked
for the old kernel tree to stay for history purposes since the new
linux modules believe last month was the dawn of time.  He thought
the drop-in trees could be made by simply copying the kernel module
and deleting all the files that weren't needed, resulting in the same
(pruned) tree [though with different actual version numbers inside]
but with all the old history.  Any thoughts on the value of that?

Well, that's all for now...

--Jeremy Siegel