info-cvs
[Top][All Lists]
Advanced

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

Re: Root of hierachy


From: ngc891
Subject: Re: Root of hierachy
Date: Mon, 20 Dec 2004 23:29:02 +0100
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7.3) Gecko/20040910

Hi Larry,

I think that I've not really understood what CVS means.

My understanding is, that when I'm importing a new project, it should be something like "1.0" with a tag like "Import". Then I'm creating a branch to work on (say "1.0.1.0"). If I'm finished on that branch, I'd put a release tag on it (say "brelease"). After I've released that version, I'd like to convert this release to the "Root" revisions (that's like 1.1 or 1.2) by merging and release this "Root" revision.

As you said, this it not how CVS works.
Please tell me, how does CVS works. I didn't found it anywhere in the internet (I was looking for it for 3 month :-) )

Should "1.1.1.1" be the "Root" and "1.1.1.1.1.1" be the first WorkBranch?
Could be so, but the release numbers would be hard to remember.

I'd really like a way to merge all back to what I'm calling the "Root", that is somethink like revision "1.2" or "1.3".

As I told before, I'm just a beginner. So, don't push too hard.
I'm just trying to understand the background of CVS.

--Best Wishes
--ngc891


Larry Jones wrote:
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 "1.1.1.1" to "1.1.1.2" 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]