From owner-freebsd-current Sun Apr 6 07:18:15 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id HAA22868 for current-outgoing; Sun, 6 Apr 1997 07:18:15 -0700 (PDT) Received: from shrimp.dataplex.net (shrimp.dataplex.net [208.2.87.3]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id HAA22861 for ; Sun, 6 Apr 1997 07:18:11 -0700 (PDT) Received: from [208.2.87.4] (cod.dataplex.net [208.2.87.4]) by shrimp.dataplex.net (8.8.5/8.8.5) with ESMTP id JAA15615; Sun, 6 Apr 1997 09:17:57 -0500 (CDT) X-Sender: rkw@shrimp.dataplex.net Message-Id: In-Reply-To: <19970405163731.AI51903@uriah.heep.sax.de> References: ; from Richard Wackerbarth on Apr 5, 1997 06:49:08 -0600 <33464317.2E0F@mindspring.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Date: Sun, 6 Apr 1997 09:14:36 -0500 To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) From: Richard Wackerbarth Subject: Re: CVSUP RELENG_2_2 Question Cc: freebsd-current@freebsd.org (FreeBSD-current users), rlb@mindspring.com (Ron Bolin) Sender: owner-current@freebsd.org X-Loop: FreeBSD.org Precedence: bulk At 9:37 AM -0500 4/5/97, J Wunsch wrote: >As Richard Wackerbarth wrote: > >> No. You have the correct tag for the 2.2 tree. >> However, it is likely that the current ipfilter stuff has not >> been placed in that tree yet. > >Indeed. > >I've considered to merge it into 2.2, but eventually gave up. It was >(and IMHO still is) in a defunct state [...] >Once these points are fixed (which requires someone who's got a clue >about how ipfilter is working, and who can test it -- thus not me), >ipfilter can be tagged/merged into RELENG_2_2 as well. Note that, IMHO, this is as it should be. All of us who clammor that it is too early to really kill the 2.1 branch will have even more ammunition if things were still going into the 2.2 branch "before they are ready". The head branch is the development ground. If things are not quite right there, it is understood. However, the other branches should be protected from such problems.