Re: Updating from parent directory

[Eric Siegerman]

On Mon, Mar 03, 2003 at 02:45:25PM -0500, Larry Jones wrote:
> Craig Dickson writes:
> > 
> > Of course there is no real need to pass the -r MAIN argument, since it will
> > default to this, but this means I need to have logic in my script to act
> > differently depending on if it is the MAIN branch or another branch.
> > 
> > Am I doing something wrong, or is it normal not to be able to refer to the
> > MAIN branch just like any other branch?
> 
> Like the error message says, there is no "MAIN" branch.  There is a
> *default* branch, which is usually referred to as the "trunk", but it
> is a virtual entity and has no name.

If necessary, you can refer to the trunk with "-A".  In theory,
that's not always safe, since it can reset other sticky
attributes besides the branch.  That said, it's never been a
problem for me in practice.  Either way, though, it's still a
special case in your script.

However, it's updates you're talking about.  Once you've got all
the subdirectories checked out -- using the "-r foo" or nothing,
as appropriate -- the updates shouldn't have to specify a branch.
A simple:
        cvs update -dP <directory>
for each directory should work in all cases.

Indeed, if you just say:
        cvs update -dP B1_0 B2_0 MAIN
it should do the right thing -- but I'd want to test that before
depending on it.  (Note: the arguments there are the directory
names, not the branch names.)

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
A distributed system is one on which I cannot get any work done,
because a machine I have never heard of has crashed.
        - Leslie Lamport