Forum OpenACS Q&A: I've branched the CVS tree for OACS 4.5

1: I've branched the CVS tree for OACS 4.5

Posted by Don Baccus on 03/09/02 06:36 PM

OK, I've done the deed.

The tag for the 4.5 release is oacs-4-5 (I went with lower case).
Those of you who are working on bug fixes and the like for this
release need to do this:
<blockquote><pre>
cvs update -r oacs-4-5
</pre></blockquote>
From your openacs-4 directory, or you can check it out into a new
directory like this:
<blockquote><pre>
cvs checkout -r oacs-4-5 openacs-4-5
</pre></blockquote>
Committing from your openacs-4-5 workspace will put changes back into
the 4.5 branch, while committing from the untagged workspace will put
changes back into the untagged, development branch.

When you update in your tagged workspace, *don't* use -A as that will
get rid of the "sticky" 4.5 branch tag! Not what you want if I
understand correctly (and if I don't, correct me quickly, please!)

For sanity's sake:
Important bug fixes meant to be part of the 4.5 release should go
in that branch (you should probably talk to me first, as I'm hoping to
cut and tag oacs-4-5-beta-1 tomorrow, and only necessary bug fixes
will go in that branch so we can really, really, make a final release
in finite time).
Enhancements, complex bugfixes for infrequent problems, and the
like should all go into the development (untagged) branch, I think.
*please* be careful as to where you commit your changes. I'm going
to set up two workspaces on my own machines - "openacs-4-5" and
"openacs-devel" in order to help me keep things straight.
Don't commit bugfixes to the 4.5 branch to the development branch,
as that will complicate merging. I'll do a merge as soon as the beta
goes out and will tag that as the docs suggest, so I can then merge
the changes from beta->final into the main tree afterwards without
messing things up.
Any CVS guru among us who wants to comment further, please feel free!

2: Response to I've branched the CVS tree for OACS 4.5 (response to 1)

Posted by Don Baccus on 03/09/02 06:38 PM

Minor correction - if you checkout you'll have to do a "mailto:-dyouraccount@openacs.org:/cvsroot" ...

3: Response to I've branched the CVS tree for OACS 4.5 (response to 1)

Posted by Don Baccus on 03/09/02 06:47 PM

I'm such a CVS loser :) OK, this is what I *really* had to do to check out the 4.5 branch:
<blockquote><pre>
cvs mailto:-ddonb@openacs.org:/cvsroot -r oacs-4-5 -d openacs-4-5 -P openacs-4
</pre></blockquote>
If you want to check to make sure that things work as expected, look in one of the convenient CVS/Tag files conveniently used by CVS to track tone of the convenient CVS/Tag files conveniently used by CVS to track tags. It should have a line that looks like "Toacs-4-5" in it.

You don't have to use "-P" (prune) with "-r" because "-r" implies it, but you should when checking out the development tree, so I just use it all the time.

To check out the development branch, try:
<blockquote><pre>
cvs mailto:-dyouraccount@openacs.org:/cvsroot -d openacs-4-devel openacs-4
</pre></blockquote>
if you want to use the directory naming convention I'm going to use for sanity's sake.

4: Response to I've branched the CVS tree for OACS 4.5 (response to 1)

Posted by Neophytos Demetriou on 03/09/02 07:14 PM

To check out the 4.5 branch:


cvs -dyouraccount@openacs.org:/cvsroot checkout -r oacs-4-5 -d openacs-4-5 -P openacs-4




To check out the development branch:



cvs -dyouraccount@openacs.org:/cvsroot checkout -d openacs-4-devel openacs-4

Note: Don taught me all I know about CVS :)

5: Response to I've branched the CVS tree for OACS 4.5 (response to 1)

Posted by Tom Jackson on 03/09/02 07:49 PM

Closing the code tag, but guys I'm a true flunky when it comes to someone else's CVS repository. I know I had an account when I checked in the cronjob package. Can someone figure out what my account was, and since it was limited to a small part of the tree, can I do the checkout as you suggest. Finally, from the top, the commands you gave above don't seem to work for me, even with the donb account, I get connection refused. Do you have to export CVSRSH, do you have to cvs login first? I'm really interested in the devel branch, so any help would be greatly appreciated.

6: Response to I've branched the CVS tree for OACS 4.5 (response to 1)

Posted by Tom Jackson on 03/09/02 07:51 PM

One more code tag, hope this is all.

7: Response to I've branched the CVS tree for OACS 4.5 (response to 1)

Posted by Neophytos Demetriou on 03/09/02 08:00 PM

First, export CVS_RSH=ssh. Then, choose a branch as above.

8: Response to I've branched the CVS tree for OACS 4.5 (response to 1)

Posted by Don Baccus on 03/09/02 10:17 PM

Oops, thanks for the "checkout" Neophytos. I'm sick with some viral crap, what can I say?

Tom, you can't log in using my account unless you know my password, and I bet you don't! As ND says you need to set CVS_RSH=ssh.

Your account is "tomj" and your password, well, it started out as the same password as your OpenACS.org web login password, but if you changed it, you're on your own in regard to memory. E-mail me with a suggested new password if you can't figure out your own.

You can check everything out, the access control list only comes into effect when you try to commit.

Lastly anonymous checkout should work, too ...

9: Response to I've branched the CVS tree for OACS 4.5 (response to 1)

Posted by Tom Jackson on 03/10/02 06:47 AM

Okay, I seem my error now, for some reason I mistyped and used export CVSRSH=ssh, so that explains the connection refused. Don, thanks for shaking my memory, everything is working great now.