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

[Matt Reason]

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 possible I'm going about this wrong.  Let me rephrase my question:
How do I add files to a branch and then have them show up in the Head
post merge?  Is this possible or not?

I need to be able to add files to a branch and then merge them to the
Main.  If CVS can't do it, then I'll cut my losses and get a new version
control system.

OT - Sorry about the multiple postings.  This is my first post to the
group and I kept getting "mailbox full" replies.  I now realize those
are the mailboxes of subscribers not the list server.


-----Original Message-----
From: Larry Jones [mailto:address@hidden 
Sent: Thursday, July 22, 2004 12:36 PM
To: Matt Reason
Cc: address@hidden
Subject: Re: Files added to branch end up in Attic post merge to Head.


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