On Wed, Sep 15, 2004 at 06:53:56PM -0700, ZHANG YD wrote:
> Date: Wed, 15 Sep 2004 18:53:56 -0700 (PDT)
> From: ZHANG YD <yuandanzhang@xxxxxxxxx>
> To: fedora-list@xxxxxxxxxx
> Subject: CVS problems
> Reply-To: For users of Fedora Core releases <fedora-list@xxxxxxxxxx>
>
> Hi, Start using CVS, I have following question:
>
> I update the file stsflrmap.f90 in 3 revisions, 1.1,
> 1.2, and 1.3
>
> I cvs co -r 1.2 stsflrmap.f90 and made changed. when I
> tried to update it
>
> cvs update
> cvs ci
> I got these error message, please guide a fix.
>
> cvs commit: Examining .
> cvs commit: sticky tag `1.2' for file `stsflrmap.f90'
> is not a branch
> cvs [commit aborted]: correct above errors first!
I see that Mike gave you a URL for the documentation.
Here are some thoughts about what I think you need to discover in that
documentation.
So you have 1.1, 1.2 AND 1.3 checked into the system.
Now you checked out a copy of 1.2 and make a change.
Then you start to check that 1.2+change into the system.
Commonly 1.2+change would generate version 1.3 but 1.3 exists and that
standard action is excluded by the revision history.
There are two obvious (to me) choices
a) you want 1.2.1 to be checked in (start a branch)
b) you want 1.4 to be checked in.
So you need to tell the system what you want.
Remember that 1.3 is already checked into (ci) in the system and while
it might be possible to force it to be overwritten that is not a
standard option.
In addition to looking at CVS documentation look at RCS and SCCS
documentation. The whole concept of revisions, branches, patches,
diff, rpm, backups and source management is important.
Source management can apply to spread sheets, text, status documents,
books, anything that is reviewed, revised or changes over time.
--
T o m M i t c h e l l
In the USA, vote informed, second Tuesday Nov 2004.
