Menu
▾
▴
Re: [Dri-devel] Latest compilation errors
|
From: Kevin E M. <ma...@va...> - 2001-02-17 17:19:30
|
On Sat, Feb 17, 2001 at 10:34:24AM -0500, Rik Faith wrote: > On Sat 17 Feb 2001 19:18:11 +1100, > Gareth Hughes <ga...@va...> wrote: > > xc/programs/Xserver/render/picture.c on the mga-1-0-0-branch is version > > 1.1.1.4.somthing, while the version on the trunk is 1.2. 'cvs log > > picture.c' reveals the following: > > > > ... > > sarea-1-0-0-branch: 1.1.1.5.0.8 > > mga-1-0-0-20010215-merge: 1.1.1.5 > > mga-1-0-0-20010215-freeze: 1.1.1.4.4.1 > > ... > > X_4_0_2-20001221-merge: 1.1.1.5 > > X_4_0_2: 1.1.1.5 > > ... > > X_4_0_1g-20001130-merge: 1.1.1.4 > > X_4_0_1g: 1.1.1.4 > > X_4_0_1f-20001130-merge: 1.1.1.3 > > X_4_0_1f: 1.1.1.3 > > X_4_0_1e-20001107-merge: 1.1.1.3 > > X_4_0_1e: 1.1.1.3 > > X_4_0_1d-20001107-merge: 1.2 > > X_4_0_1d: 1.1.1.3 > > ... > > > > We see the 4.0.1d made a version 1.2, while all the ones after that made > > versions 1.1.1.something. Perhaps this file (and others) weren't fixed > > by Rik's work? > > Ok, I've fixed 62 additional files that weren't in the first set: > > $ cvs log -N -r1.2.2.1 -r1.3 \ > | agrep -d'$$' '^branch:$' \ > | agrep -d'$$' '^head: 1\.2$' \ > | agrep -d'$$' 'revision 1\.2\.2\.1' \ > | agrep -v -d'$$' 'revision 1\.3' \ > | fgrep 'Working file:' \ > | sed 's,Working file: ,,' \ > | fgrep -v /Attic/ \ > > /tmp/OUTPUT-1.2.2 > > $ for i in `cat /tmp/OUTPUT-1.2.2`; do > echo $i > cvs admin -b1.2.2 $i > done > > Note that it's extremely important that NO ONE ever runs a 'cvs admin' > command without extensive discussion. > > Also, if you used Gareth's quick work around, remember to use -A when > you 'cvs update' to remove the sticky tag. > > I'm doing another update and make World now... I just finished a complete "make World", and it appears to be working again. Thanks Rik!! Kevin |