If you checked out your tree using:

cvs co jakarta-struts

then you checked out the main trunk, which is currently Struts 1.1 (or at
least post-1.0). When you do a checkin in that tree, it will go back into
the main trunk.

You can check out a branch using:

cvs co -rSTRUTS_1_0_BRANCH jakarta-struts

and then checkins from that tree will go into the branch.

You can check to see if you checked out a file in a branch by using:

cvs status <filename>

and looking at the "Sticky Tag" line. It will either say "(none)", which
means you are on the main trunk, or something like "STRUTS_1_0_BRANCH" if
you are on a branch.

You can see what branches are available by using:

cvs status -v <filename>

which will list all of the existing tags (for that file, but they will
usually be per-project anyway).

If you are using Windows, and use WinCVS, you can also use the Graph
command, which will show you a graphical version of the log, with labels
attached at branch and label points.

--
Martin Cooper


----- Original Message -----
From: "SCHACHTER,MICHAEL (HP-NewJersey,ex2)" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Monday, June 11, 2001 7:33 PM
Subject: Main Branch/1.0 Branch and CVS


> Hi,
>
> Could someone clear this up for me?  I'm not totally sure exactly what
> I'm doing at this point when I do a cvs commit.  I'll assume that when I
> just do a normal commit to the jakarta-struts repository, that's the main
> branch.  How do I send commits to and checkout the 1.0 branch?  How do I
> know that a 1.0 branch exists, or a 1.1 for that matter?


Reply via email to