Boston Linux & Unix (BLU) Home | Calendar | Mail Lists | List Archives | Desktop SIG | Hardware Hacking SIG
Wiki | Flickr | PicasaWeb | Video | Maps & Directions | Installfests | Keysignings
Linux Cafe | Meeting Notes | Blog | Linux Links | Bling | About BLU

BLU Discuss list archive


[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS anomaly



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:

 > 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
> ============================================================================= 
> 





BLU is a member of BostonUserGroups
BLU is a member of BostonUserGroups
We also thank MIT for the use of their facilities.

Valid HTML 4.01! Valid CSS!



Boston Linux & Unix / webmaster@blu.org