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



On Thu, Jul 20, 2006 at 10:59:24AM -0400, 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).

Was this repository created by importing a project? I would guess
someone did a "cvs import <repository> TOPDIR Version_1".

I've always been mystified by the workings of CVS on imported projects -
they seem to behave as if the imported branch is the trunk.

Nathan

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




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