CVS anomaly

[gaf at blu.org (Jerry Feldman)]

On Thursday 20 July 2006 11:08 am, David Rosenstrauch wrote:
> Generally I see a numbering like that when I check something in on a
> branch vs. on the HEAD.  The HEAD will get numbering like 1.1, 1.2,
> etc., while the branch will get 1.1.1.1, 1.1.1.2, etc.
>
> I'm not clear from your output exactly what the head & branch structure
> is in your repository, but this bit here suggests to me that you
> accidentally might have created a branch called "1.1.1" and checked
> something in on it:
That was my initial thought, but, looking at BasicType.H it also shows that 
branch. In any case, the guys up in Toronto are in training today, so I can 
play with this and see if I can force a revision 1.2 for BuiltinType.H.

>  > Working file: BuiltinType.H
>
> ...
>
>  > ----------------------------
>  > revision 1.1
>  > date: 2005/05/31 15:02:49;  author: gfeldman;  state: Exp;
>  > branches:  1.1.1;
>  > Initial revision
>  > ----------------------------
>
> HTH,
>
> DR
>
> Jerry Feldman wrote:
> > I've got a file that somehow a revision got checked in as 1.1.1.2
> > Most of the other files that have been modified are revision 1.2 or
> > higher (as expected). I've got 2 log files below, BuiltinType.H and
> > BasicType.H (which is 1.2 as expected). I've tried to force
> > BuiltinType.H to revision 1.2 by outdating it, and reapplying the
> > changes. In the 2 cases below, the revisions were initially checked in
> > on the same day using cvs commit -m"log message" <filename>
> > Any ideas on this (and I can't switch to subversion as this is not my
> > system).
> >
> >
> > Working file: BuiltinType.H
> > head: 1.1
> > branch:
> > locks: strict
> > symbolic names:
> >         Version_1: 1.1.1.1
> >         TOPDIR: 1.1.1
> > keyword substitution: kv
> > total revisions: 3;     selected revisions: 3
> > description:
> > ----------------------------
> > revision 1.1
> > date: 2005/05/31 15:02:49;  author: gfeldman;  state: Exp;
> > branches:  1.1.1;
> > Initial revision
> > ----------------------------
> > revision 1.1.1.2
> > date: 2006/07/20 13:47:05;  author: gfeldman;  state: Exp;  lines: +121
> > -1 Added 64-bit classes
> > ----------------------------
> > revision 1.1.1.1
> > date: 2005/05/31 15:02:49;  author: gfeldman;  state: Exp;  lines: +0
> > -0 Initial checkin of Intel XXXXX
> > =======================================================================
> >======
> >
> > Working file: BasicType.H
> > head: 1.2
> > branch:
> > locks: strict
> > symbolic names:
> >         Version_1: 1.1.1.1
> >         TOPDIR: 1.1.1
> > keyword substitution: kv
> > total revisions: 3;     selected revisions: 3
> > description:
> > ----------------------------
> > revision 1.2
> > date: 2006/06/14 21:29:04;  author: gfeldman;  state: Exp;  lines: +6
> > -2 added bsizeof_INT64
> > ----------------------------
> > revision 1.1
> > date: 2005/05/31 15:02:49;  author: gfeldman;  state: Exp;
> > branches:  1.1.1;
> > Initial revision
> > ----------------------------
> > revision 1.1.1.1
> > date: 2005/05/31 15:02:49;  author: gfeldman;  state: Exp;  lines: +0
> > -0 Initial checkin of Intel XXXXX
> > =======================================================================
> >======
>
> _______________________________________________
> Discuss mailing list
> Discuss at blu.org
> http://olduvai.blu.org/mailman/listinfo/discuss

-- 
Jerry Feldman <gaf at blu.org>
Boston Linux and Unix user group
http://www.blu.org PGP key id:C5061EA9
PGP Key fingerprint:053C 73EC 3AC1 5C44 3E14 9245 FB00 3ED5 C506 1EA9