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

[Jim.Hyslop]

Matt Reason wrote:
> I've seen several posts that tangentially address this issue, but none
> of the replies could explain the phenomenon.  Please excuse me for
> re-asking.
> 
> I added a ton of files on a branch the other day.  I merged the branch
> to the Head yesterday and all of the files went into the 
> Attic.  I have
> no idea why this has occurred.  To me it seems like a bug.  There is
> nothing in the documentation about this.  Can anyone explain 
> this to me?
When you check out the HEAD, do you get all the files that you expect? If
so, then don't worry about it.

> Once I understand why this occurred, I need to clean up the mess.  Is
> there any way, other than a brute-force re-add to get these 
> files out of
> the attic and back in business?
How do you mean, "back in business"? This implies that you're getting an
error that you have not told us about.

If you are getting an error, then please post details on it, and skip the
rest of this message.

If you're still reading, then I assume you are not getting any errors, and
when you check out the HEAD, you get back the versions you expect. If that
is the case, then:

CVS is very good at keeping track of what's going on. If you go in there and
try to force it to do things, you may end up causing a bigger problem. 

For the most part, the repository should be treated as a black box - as long
as the program gives you back exactly what you asked for, then the details
as to where and how the files are stored is none of our business.

Let me put it this way. We have about 75 developers in this location. As you
can imagine, the repository is very big and very active. We use pserver
(yes, I know all about the security risks) so most people don't even have
login privileges on the server. As an administrator, though, I have a login
account. I rarely need it. I don't think I've ever had to go to the
repository to see if a file was in the main directory or in the Attic.

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)