[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Root of hierachy

From: Larry Jones
Subject: Re: Root of hierachy
Date: Mon, 20 Dec 2004 15:10:21 -0500 (EST)

ngc891 writes:
> I've now checked out my working directory as "avendor", my working 
> branch.

NO!  The vendor branch is *only* for vendor releases.  For local
changes, you want to be working on the trunk, not the vendor branch. 
The trunk (what you call the root branch) is what you get when you don't
specify any particular revision to checkout.  You can switch your
existing working directory to the trunk with "update -A".

> I've now changed one file (say one t.c) from "" to 
> "" and committed that to the working branch "avendor".
> The I've tagged this new revision to "brelease".

Unless you're simulating a second vendor release without doing an
import, that's completely wrong.

> My problem now is, how to convert this new release "brelease" to the 
> "Root"-Branch (that is something 1.*)!

In this particular case you don't have to do anything, but in general,
in a working directory on the trunk, do "update -jarelease -jbrelease". 
A normal import would have suggested that.

> What is the name of the Root-Branch? I've never been asked to create 
> one. And the graphical display doesn't show a name corresponding to 
> revision 1.1.

There isn't one.  And you can't really create one, either.  As I said
before, it's what you get when you don't specify any name.

> What I want to see is revisions 1.1 of all files for the "Root" and a 
> revision "1.2" for the file "t.c", when I'm working "Root", whatever 
> that is...

That isn't how CVS works.  You'll only see 1.x for locally modified
files.  All the unmodified files will be referenced from the vendor
branch and thus be 1.1.1.x.  The revision numbers are really for CVS's
intenal use, you shouldn't worry about what they are.  You should use
tags for infomation that's meaningful to you.

-Larry Jones

It's either spectacular, unbelievable success, or crushing, hopeless
defeat!  There is no middle ground! -- Calvin

reply via email to

[Prev in Thread] Current Thread [Next in Thread]