[cvsnt] Re: Subdirectories and CVS merge problem

[Oliver Giesen]

> I was just merging a branch back into the main development line and
> noticed that my new subdirectories that I made in the branch are not
> merged into the main branch (they just don't appear at all after the
> merge, allthough the changed/added files in directories that already
> existed ARE merged in correctly). Is that normal? How can I force these
> directories (and the files in there) to be merged?

Did you merge using Update or Checkout? Checkout should work AFAICT. Update
might require the -d option but I'm not sure on that one.

Hope this helps.

Oliver
---- ------------------
JID: ogiesen at jabber.org
ICQ: 18777742
      (http://wwp.icq.com/18777742)