[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Tagged branch not found
From: |
Larry Jones |
Subject: |
Re: Tagged branch not found |
Date: |
Thu, 4 Jul 2002 13:50:56 -0400 (EDT) |
Vince Rice writes:
>
> Well, something is obviously wrong, because I have four *revisions* checked
> in that I can check out by specific revision number, e.g. (I've removed the
> comments to protect the guilty. :) )
>
> revision 2.11.0.4
> date: 2002/06/26 19:44:05; author: cvsuser; state: Exp; lines: +7 -8
> ----------------------------
> revision 2.11.0.3
> date: 2002/03/06 20:45:58; author: cvsuser; state: Exp; lines: +38 -42
> ----------------------------
> revision 2.11.0.2
> date: 2002/03/06 20:45:15; author: cvsuser; state: Exp; lines: +16 -3
> ----------------------------
> revision 2.11.0.1
> date: 2002/03/06 20:43:48; author: cvsuser; state: Exp; lines: +119 -38
> ============================================================================
Those are invalid revision numbers. There's no way CVS created them on
its own -- someone must have forced it to use them.
> As you noted, the rel-61303 *is* a revision tag, or at least intended to be.
> The fact that it appears to be a branch tag is I'm sure another symptom of
> the above problem.
It doesn't just appear to be a branch tag; as far as CVS is concerned,
it *is* a branch tag: revision numbers ending with 0.n are CVS "magic"
branch tags.
> Here's what's *supposed* to be true: 2.11 has a branch on it that has four
> revisions, and HEAD continues with 2.12, 2.13...2.17. I think I'll fix it
> by
> a. checking out each of the above revisions and renaming them
> b. deleting each of the branch/revision tags below
> c. check out 2.11 as the working copy
> d. make a branch tag
> e. update the working copy to the branch (cvs update -r <branch>)
> f. Copy each of the above revisions over the working copy and re-check them
> in.
>
> At that point I should have a good branch with four revisions, not four
> mysterious branch/revisions.
You should be able to just make a branch off of 2.11, update to the
branch, and then use update -j to merge in the changes from each bogus
revision in sequence and commit:
cvs tag -r 2.11 -b branch
cvs up -r branch
cvs up -j2.11.0.1 file
cvs ci file
cvs up -j2.11.0.2 file
cvs ci file
...
-Larry Jones
Well of course the zipper's going to get stuck if everyone
stands around WATCHING me! -- Calvin