Date: Thu, 6 Jun 1996 13:51:19 +0200 (MET DST) From: grog@lemis.de (Greg Lehey) To: jkh@time.cdrom.com (Jordan K. Hubbard) Cc: freebsd-stable@freebsd.org (FreeBSD Stable Users) Subject: Re: Mega-Commit cleanups Message-ID: <199606061151.NAA02909@allegro.lemis.de> In-Reply-To: <26451.834004904@time.cdrom.com> from "Jordan K. Hubbard" at Jun 5, 96 01:01:44 pm
next in thread | previous in thread | raw e-mail | index | archive | help
Jordan K. Hubbard writes: > >> Before I go and start cleaning things up that I'm pretty sure are bugs >> I'd like to hear what exactly is that we are supposed to do. > > 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. For example, this is /usr/src/lib/libc/net/Makefile.inc: + RCS file: RCS/Makefile.inc,v + Working file: Makefile.inc + head: 1.14 + branch: + locks: strict + access list: + symbolic names: + RELENG_2_1_0_RELEASE: 1.7 + RELENG_2_1_0: 1.7.0.4 + RELENG_2_1_0_BP: 1.7 + RELENG_2_0_5_RELEASE: 1.7 + RELENG_2_0_5: 1.7.0.2 + RELENG_2_0_5_BP: 1.7 + RELENG_2_0_5_ALPHA: 1.7 + RELEASE_2_0: 1.5 + BETA_2_0: 1.5 + ALPHA_2_0: 1.5.0.2 + after_bind_commit: 1.3 + before_new_bind: 1.2 + bsd_44_lite: 1.1.1.1 + CSRG: 1.1.1 + ... skipping + revision 1.1.1.1 + date: 1994/05/27 04:57:08; author: rgrimes; state: Exp; lines: +0 -0 + BSD 4.4 Lite Lib Sources + ---------------------------- + 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. Am I doing something wrong here, is something getting screwed up in transmission, or is this a bug? I'm currently (for the fourth solid day in a row) starting again. This time I'll check out the complete source tree, but I can't see how this can work. Greg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199606061151.NAA02909>