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

[Larry Jones]

Matt Reason writes:
> 
> 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?

Are you sure that's what happened?  The files should have gone into the
Attic when you added them to the branch.  When you merge the branch onto
the trunk *and commit*, they should get moved out of the Attic.  The
rule is that a file should be in the Attic if, and only if, it does not
exist on the head of the default branch (which is usually the trunk, but
can be the vendor branch).

-Larry Jones

It seems like once people grow up, they have no idea what's cool. -- Calvin