ARGH.... total confusion...

[Eric Anholt]

On Thu, 2004-10-28 at 19:49, 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?!
> 
> ... and eventually revert to the previous version, if I did something 
> terribly wrong?
> 
> 
> No, I have not been drinking...

This is the normal surprising behavior of vendor branches.  r1.1 was
"R6.6 is the Xorg base-line".  Then several imports happened on the
vendor branch, bringing us to 1.1.1.3.  Now, you went and committed on
HEAD, so your new revision is 1.2, a 1-line diff from 1.1.1.3, and the
default branch is now HEAD (no branch) instead of 1.1.1.  However,
ViewCVS and friends don't know this, so they diff 1.1 to 1.2 and say
that you went stomping.

-- 
Eric Anholt                                eta at lclark.edu          
http://people.freebsd.org/~anholt/         anholt at FreeBSD.org