Re: Files added to branch end up in Attic post merge to Head.

[Larry Jones]

Matt Reason writes:
> 
> I'm 100% sure.  I have the branch and the head checked out into
> different dirs on my desktop.  The files I added to the branch are
> sitting there happily but the on the main - they're gone.

It's not the things you don't know that get you into trouble, it's the
things you know that just aren't so.  I'm not questioning the current
state of your repository, but I find your description of how it got into
that state quite unlikely.

The most likely source of your problem is that you merged into a working
directory but didn't commit the resulting files.  If you do "cvs log" on
one of the affected files and post the result, we can tell for sure
what's going on.  Oh, and you might mention what release(s) of CVS
you're using.

-Larry Jones

Isn't it sad how some people's grip on their lives is so precarious
that they'll embrace any preposterous delusion rather than face an
occasional bleak truth? -- Calvin