[Dri-devel] CVS misbehaving

[Brian Paul]

David,

I think this is a CVS problem that we've seen before.

After merging from the DRI trunk and checking in the changes to the mesa-41
branch I'm finding that a number of files in xc/programs/Xserver/hw/xfree86
drivers/geode aren't getting updated correctly.

Basically, committing changes to these files "doesn't take". The CVS
check-in message reports no net change:

1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/galstub.c
1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode.h
1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode_accel.c


In fact, one line is different between the trunk and mesa-41 branch:
the $Revision$ line, for example:


diff -rc --exclude CVS DRI-main/xc/xc/programs/Xserver/hw/xfree86/drivers/geode/galstub.c DRI-mesa5/xc/xc/programs/Xserver/hw/xfree86/drivers/geode/galstub.c

*** DRI-main/xc/xc/programs/Xserver/hw/xfree86/drivers/geode/galstub.c 2002-10-22 17:38:44.000000000 -0600
--- DRI-mesa5/xc/xc/programs/Xserver/hw/xfree86/drivers/geode/galstub.c 2002-11-22 16:31:28.000000000 -0700
***************
*** 1,7 ****
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/geode/galstub.c,v 1.1 2002/10/11 14:32:58 alanh Exp $ */
/*
* $Workfile: galstub.c $
! * $Revision: 1.2 $
*
* File Contents: This file contains the file inclusions of the GAL
*
--- 1,7 ----
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/geode/galstub.c,v 1.1 2002/10/11 14:32:58 alanh Exp $ */
/*
* $Workfile: galstub.c $
! * $Revision: 1.2.10.3 $
*
* File Contents: This file contains the file inclusions of the GAL
*


In this instance it's not a big deal. I'm wondering if something like
this might happen when I merge from the mesa-41 branch to the trunk?

-Brian



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel