James Chacon wrote:

> Do I have to check out each set on top of the others to avoid this? Getting
> half the tree stuck on the 1.5 branch and half on the trunk is a bit
> disturbing.

  I don't know how this happened to you in the first place (I never had
this problem), but

  cvs update -PAd

  from the checked-out src directory should fix your problem and return
you to the trunk ...

  Cheers
      ,
   Rene