Date: Thu, 6 Jun 1996 09:24:05 -0600 From: Nate Williams <nate@sri.MT.net> To: grog@lemis.de (Greg Lehey) Cc: jkh@time.cdrom.com (Jordan K. Hubbard), freebsd-stable@freebsd.org (FreeBSD Stable Users) Subject: Re: Mega-Commit cleanups Message-ID: <199606061524.JAA25467@rocky.sri.MT.net> In-Reply-To: <199606061151.NAA02909@allegro.lemis.de> References: <26451.834004904@time.cdrom.com> <199606061151.NAA02909@allegro.lemis.de>
next in thread | previous in thread | raw e-mail | index | archive | help
> > Well, I tried to upgrade the really old and musty /usr/src/etc bits in > > -stable when I did my 3rd megacommit. I felt "fairly" safe with this > > section of the source, so I decided to not roll that part of my > > changes all the way back (along with calendar and colldef). If there > > are dangling references, please feel free! > > I'm still having a lot of trouble just getting the *(&*(& to compile. > The way I see it, a lot of the CVS files have an incorrect tag for > RELENG_2_1_0. Ahh, you don't understand the magic of CVS. (Or does it use something more evil). Peter explained this to me once, and Jordan reminded me of this yesterday. CVS uses a special tag to denote a branch line. It appends a zero to the major revision, and then adds the minor number of the revision on the end. So, when it comes time to check something out, it finds the zero, removes it and shifts everything to the right and grabs the most recent version on that brach. > + RELENG_2_1_0: 1.7.0.4 So, version 1.7.4.X where X is the highest number revision is the correct version on this branch. > + ---------------------------- > + revision 1.7.4.2 > + date: 1996/06/05 02:48:18; author: jkh; state: Exp; lines: +6 -10 > + This 3rd mega-commit should hopefully bring us back to where we were. > + I can get it to `make world' succesfully, anyway! > + ---------------------------- > + revision 1.7.4.1 > + date: 1996/06/03 05:07:56; author: jkh; state: Exp; lines: +10 -6 > + Phase 2 of merge - also fix things broken in phase 1. > + Watch out for falling rock until phase 3 is over! > + > + libc completely merged except for phkmalloc & rfork (don't know if David > + wants that). > + > + Some include files in sys/ had to be updated in order to bring in libc. > + ---------------------------- > + ============================================================================= > + (END) > > The way I read this, RELENG_2_1_0 should be revision 1.7.0.4, but > there *is* no 1.7.0.4. On the other hand, your commint information > suggests that it should be 1.7.4.2. So, everything is correct. Nate
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199606061524.JAA25467>