From owner-freebsd-current  Mon Feb 26 14:41:08 1996
Return-Path: owner-current
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id OAA23596
          for current-outgoing; Mon, 26 Feb 1996 14:41:08 -0800 (PST)
Received: from who.cdrom.com (who.cdrom.com [192.216.222.3])
          by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id OAA23579
          Mon, 26 Feb 1996 14:41:04 -0800 (PST)
Received: from GndRsh.aac.dev.com (GndRsh.aac.dev.com [198.145.92.241])
          by who.cdrom.com (8.6.12/8.6.11) with ESMTP id OAA02654
          ; Mon, 26 Feb 1996 14:41:01 -0800
Received: (from rgrimes@localhost) by GndRsh.aac.dev.com (8.6.12/8.6.12) id OAA14871; Mon, 26 Feb 1996 14:38:22 -0800
From: "Rodney W. Grimes" <rgrimes@GndRsh.aac.dev.com>
Message-Id: <199602262238.OAA14871@GndRsh.aac.dev.com>
Subject: Re: IPFW (was: Re: -stable hangs at boot)
To: nate@sri.MT.net (Nate Williams)
Date: Mon, 26 Feb 1996 14:38:22 -0800 (PST)
Cc: phk@critter.tfs.com, stable@FreeBSD.ORG, current@FreeBSD.ORG
In-Reply-To: <199602261926.MAA00360@rocky.sri.MT.net> from "Nate Williams" at Feb 26, 96 12:26:22 pm
X-Mailer: ELM [version 2.4 PL24]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-current@FreeBSD.ORG
Precedence: bulk

...

> > Nate: 3) The code -stable is un-documented and incomplete w/regard to
> > Nate: -current.  The documentation in -stable hasn't been updated yet.  Here
> > Nate: is the last entry for the ipfw.8 man-page.
> > 
> > Reality has overtaken you again.  A couple of hours ago I committed a almost
> > complete synopsis and description to the man page.
> 
> Glad to hear it, but it happened after I sup'd the CVS tree.  It also
> appears that you need to add the patch you just made to -current into
> -stable as well.  Don't you just hate having to keep two trees in sync
> sometimes?  (Though the advantages outweigh the disadvantages).

That is why I raised the little protest the other day, this should have all
been done in -current, stabalized, tested, hashed out, etc, then and ONLY
then should have it been brought over to -stable.  As it stands now I have
``Frozen'' my stable sources until this work is done, which means I can not
take advantage of several other nice fixes that just recently went in to
-stable :-( :-(.

Work should really be done in one branch only until it is _complete_.


-- 
Rod Grimes                                      rgrimes@gndrsh.aac.dev.com
Accurate Automation Company                 Reliable computers for FreeBSD