ARGH.... total confusion...

[Thomas Winischhofer]

Daniel Stone wrote:
> On Fri, Oct 29, 2004 at 04:49:04AM +0200, Thomas Winischhofer wrote:
> 
>>Hm, now I am confused. It's about 
>>xc/programs/Xserver/hw/xfree86/common/xf86.h in HEAD.
>>
>>I did "cvs update xf86.h" before editing the file (I inserted one line).
>>
>>Then I did "cvs commit xf86.h", as the cvscommit message shows.
>>
>>Now, shockingly I see
>>
>>  Revision      Changes    Path
>>  1.2           +414 -709  xc/programs/Xserver/hw/xfree86/common/xf86.h
>>
>>And in ViewCVS
>>
>>"Changes since 1.1: +414 -709 lines"
>>
>>http://freedesktop.org/cgi-bin/viewcvs.cgi/xc/programs/Xserver/hw/xfree86/common/xf86.h?root=xorg&only_with_tag=HEAD&r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h
>>
>>The file with version 1.1 (Nov 14, 2003?!?!?!?) starts with a copyright 
>>message from Thomas Roell.
>>
>>The version I seem to have committed is copyright 1997-2003 The XFree86 
>>project. And it matches exactly the version in the 6.8.1 release (except 
>>for that single line I added, of course)
>>
>>Can anyone explain what happened here?!
> 
> 
> ... wow, that's impressive.
> 
> cvs up -A -D "two days ago" xf86.h, should give you the version from two
> days ago -- then run cvs ci.


Did that "up" with "2004-10-24" - and got a totally outdated file. It's 
the one that you see in the comparison table via ViewCVS.

Don't dare to check-in, frankly.

Huh?!

Thomas

-- 
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net          http://www.winischhofer.net/
twini AT xfree86 DOT org