Re: [parisc-linux] phase 2 gcc build fails

[Michael Ang <mang@subcarrier.org>]

Alan Modra wrote:
> 
> > Yeah, that's exactly what you wanted to do.  After you ran the "admin
> > -b" command, the vendor branch was de-vendorised, so I'm guessing that
> > the next time you pulled you got the trunk, not the branch.  With vendor
> > branches, you never really know if you're pulling from a branch or the
> > trunk, hence our desire to avoid them.
> 
> For answering, you're the lucky recipient of another question :-)

Heh, serves me right ;)
 
> Is it possible to import a vendor branch that contains new files, without
> them magically appearing when checking out the HEAD version?  I've just
> done an import from sourceware, then had to rm all the new files, cvs rm,
> cvs commit.  Which is a pain.  Also, unless people use "checkout -P", they
> get empty directories.

Hmm, I didn't realise that this was another side effect of "import".  I
generally use "add" on the branch instead, which does the right thing
for new files.  So I guess when updating a third-party branch you have
two choices:
1. Use "import", and both "admin -b" and "cvs rm" from the trunk any new
files.
2. Use "add" on the branch, and "cvs rm" any removed files from the
branch.

New files on the trunk that shouldn't be there are probably less of a
nuisance than persistent files that should be gone, but there's no need
to make this kind of mistake.

If people want to prune empty directories they should use "checkout
-P".  Here's the contents of my .cvsrc:
cvs -z3
diff -uN
remove -f

I don't turn on "checkout -P" or "update -d" by default, but that's just
me.  I've been meaning to set up a checkout module for the kernel that
would include the minimal set of stuff you need to build for PA-RISC,
omitting the other arch dependent junk.  I plan to do it Real Soon Now.

	- Mike.