[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: commiting a sticky file
From: |
Risman, Mark |
Subject: |
RE: commiting a sticky file |
Date: |
Tue, 28 Jul 2009 09:59:55 -0400 |
Lee,
It looks like your RCP_5_0_1 branch is indeed off of RCP_5_0 tag. If you
look at the output from your "status" command (or a "log" command if you
were to look at that), notice where it says "branch: 1.103.2" next to
the branch name "RCP_5_0_1". The "1.103" in that spot means that the
branch is off of the RCP_5_0 tag, which currently points to 1.103.
If you look at RCP_5_0_2, you'll see "1.103..." there too; this is also
a branch from the same place.
Also note that "RCP_5_0" is indeed a tag, but not a trunk. CVS will
allow that tag to be moved to any other revision, if someone were to
tell it so. The branch is always off of a specific revision, not tag, so
these branches will be off of 1.103, regardless of what happens to the
RCP_5_0 tag.
For more information on how to interpret those revision numbers, please
see http://ximbiot.com/cvs/manual/cvs-1.11.22/cvs_5.html#SEC58. You can
change that URL to match the cvs version you have.
-----Original Message-----
From: address@hidden
[mailto:address@hidden On Behalf Of
sparkylee
Sent: Monday, July 27, 2009 6:40 PM
To: address@hidden
Subject: Re: commiting a sticky file
i do have an RCP_5_0_1 branch. i can check out, edit and commit.
apparently i do NOT have an RCP_5_0_2 branch. so when i check THAT
out, i can't commit changes.
status on a typical file shows:
[]:/cygdrive/c/lees/dev/rcp502/rcp/src/rcp/rus: cvs status -v Rus.java
| less
===================================================================
File: Rus.java Status: Up-to-date
Working revision: 1.103.2.2
Repository revision: 1.103.2.2 /home/cvs/repository/rcp/src/
rcp/rus/Rus.java,v
Commit Identifier: O6D7s2oDTzFTDPUt
Sticky Tag: RCP_5_0_2 (revision: 1.103.2.2)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
RCP_5_0_2 (revision: 1.103.2.2)
RCP_5_0_1 (branch: 1.103.2)
RCP_6_0_CVN (revision: 1.104)
RCP_5_0 (revision: 1.103)
RCP_4_9_2 (revision: 1.102)
RCP_4_9_1 (revision: 1.101)
RCP_4_9_0 (revision: 1.100)
....
the intention was to branch RCP_5_x off of the RCP_5_0 trunk.
i wonder how i can fix this?
lee
**********************************************************
MLB.com: Where Baseball is Always On
- commiting a sticky file, sparkylee, 2009/07/25
- Re: commiting a sticky file, Spiro Trikaliotis, 2009/07/25
- Message not available
- Re: commiting a sticky file, sparkylee, 2009/07/27
- Re: commiting a sticky file, Spiro Trikaliotis, 2009/07/27
- Message not available
- Re: commiting a sticky file, sparkylee, 2009/07/27
- Re: commiting a sticky file, sparkylee, 2009/07/27
- Re: commiting a sticky file, sparkylee, 2009/07/27
- RE: commiting a sticky file,
Risman, Mark <=
- Message not available
- Re: commiting a sticky file, sparkylee, 2009/07/28
- RE: commiting a sticky file, Risman, Mark, 2009/07/28
- Message not available
- Re: commiting a sticky file, sparkylee, 2009/07/29
- RE: commiting a sticky file, Risman, Mark, 2009/07/30
- Message not available
- Re: commiting a sticky file, sparkylee, 2009/07/30
- Message not available
- Re: commiting a sticky file, sparkylee, 2009/07/30