ENC: RES: CVS import

[Marcelo Carvalho Fernandes]

Larry,

Thanks, now it's ok for me.

----
Marcelo Carvalho Fernandes
Diretor de Sistemas
Smart Tech Consulting
Avenida Rio Branco 181 Sala 1005
address@hidden
www.smartech.com.br
Tel: 55 (21) 2532-6335


-----Mensagem original-----
De: Larry Jones [mailto:address@hidden
Enviada em: quinta-feira, 15 de abril de 2004 14:54
Para: Marcelo Carvalho Fernandes
Cc: address@hidden
Assunto: Re: RES: CVS import


Marcelo Carvalho Fernandes writes:
>
> CVS should have a feature to import without creating a vendor branch

Why?  The vendor branch is neither expensive nor intrusive, feel free to
just ignore it if you don't need it.

> The URL above tells "Note that the CVS "Main Branch" and the RCS Main
Trunk
> are not the same". What is each of them ? What is the diference ?

I think it's (mis)using "Main Branch" to mean "default branch".  As I
said before, the default branch can be either the trunk (aka, the RCS
Main Trunk) or the vendor branch.

> I still can't understand why when i firts checkout CVS gets the version
from
> vendor-branch if when i modify somenthing it ill commit to the main trunk.
> At the end things will be the same, but it should checkout the version
from
> the main trunk, shouldn't it ?

Files that have not been locally modified shouldn't exist on the trunk
at all, only on the vendor branch.  However, the RCS file format doesn't
allow a branch from nothing, so *the very first revision* is placed on
the trunk, too.  Subsequent vendor releases are *not* copied to the
trunk (which would be a waste of time and space), they only exist on the
vendor branch.  Since doing a normal checkout should get you the most
recent revision of each file, files that have not been locally modified
*have* to come from the vendor branch in the general case.

-Larry Jones

That's one of the remarkable things about life.  It's never so
bad that it can't get worse. -- Calvin