*BSD News Article 36782


Return to BSD News archive

Path: sserve!newshost.anu.edu.au!harbinger.cc.monash.edu.au!msuinfo!agate!howland.reston.ans.net!cs.utexas.edu!geraldo.cc.utexas.edu!vax
From: vax@no.permanent.address (VaX#n8)
Newsgroups: comp.os.386bsd.questions
Subject: [Q] CVS and branches
Date: 10 Oct 1994 08:45:02 GMT
Organization: The University of Texas at Austin, Austin, Texas
Lines: 40
Message-ID: <37auue$1c8@geraldo.cc.utexas.edu>
NNTP-Posting-Host: slip-2-19.ots.utexas.edu
X-Newsreader: TIN [version 1.2 PL2]

Hmm, I've played with RCS quite a bit, and now I'm doing CVS stuff.
What I'm trying to do (in English) is;
  1) Grab non-configured sources from places like prep.ai.mit.edu
  2) Store this "original" form
  3) Modify or configure to get it to run on the local system
  4) Store this "local" form
  5) Make and compile, possible erasing sources (but not stored ones)

What I've tried to do:
  ftp the package & extract
  cvs import package package-branch package-1_666
  rm -fr package
  cvs rtag -b -rpackage-1_666 package-localmods package
  cvs checkout -rpackage-localmods package
  cd package
  [hack away]
  cvs commit

For whatever reasons, imported source starts as a first-level branch (1.1.1.1)
even though it seems to me it should be 1.1, but oh well.  Note that I can
name the first-level branch (in this case, I just called it package-branch).
Now, when I create the second branch, it puts the label I've given it
(package-localmods) on a strange revision number, like 1.1.1.1.0.2 instead
of what I expected (1.1.1.1.1.1).  Moreover, I don't know how to name that
branch - only the particular leaves/revisions.
Finally, if I "add" files during the [hack away] portion of my work above,
when I run commit, they are stored as r1.1, and not package-localmods.
This is evidenced later when I specifically checkout with -rpackage-localmods,
and they are not there.
Moreover, I'm not clear as to why a "cvs checkout package" with no -r options
pulls out version 1.1.1.1, rather than 1.1 (highest trunk-revision) or
1.1.1.1.0.2 (latest overall revision).

Thus, can anyone elucidate me on the vagaries of CVS?  It seems really neat,
but I'm thoroughly confused & frustrated.  I even got & installed tcl and tk,
just to run gic, and it hasn't helped a single bit. :-(
--
The above address may be incorrect, in case you hadn't noticed.
Try vax@ccwf.cc.utexas.edu
Victimless crimes are a figment of the state's collective imagination.