Re: Adding new files to branch puts them in the Attic?

[Laine Stump]

"Dennis Jones" <address@hidden> writes:

> I am working on a branch in which I am doing some side development.  If
> everything goes as planned, then this branch will eventually get merged into
> the main trunk.  The wierd thing is that when I add new files or directories
> to this branch, all the new files end up in Attic subdirectories in the
> repository.  Why is that?  Shouldn't files only go into the Attic when they
> are removed, not added? 

Files go into the Attic when they don't exist on the trunk. If a file
is added on a branch, it doesn't exist on the trunk, so the ,v file
goes in the Attic. When you want to merge your work into the trunk,
you'll need to add those new files on the trunk, after which the ,v
file will be moved out of the Attic.