From owner-cvs-user  Wed Feb 19 20:31:03 1997
Return-Path: <owner-cvs-user>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id UAA15508
          for cvs-user-outgoing; Wed, 19 Feb 1997 20:31:03 -0800 (PST)
Received: from plum.cyber.com.au (plum.cyber.com.au [203.7.155.24])
          by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id UAA15469;
          Wed, 19 Feb 1997 20:30:16 -0800 (PST)
Received: (from darrenr@localhost) by plum.cyber.com.au (8.6.12/8.6.6) id PAA01648; Thu, 20 Feb 1997 15:29:26 +1100
From: Darren Reed <darrenr@cyber.com.au>
Message-Id: <199702200429.PAA01648@plum.cyber.com.au>
Subject: Re: cvs commit: src/contrib/ipfilter/ipsend 44arp.c src/contrib/ipfilter HISTORY Makefile fil.c ip_fil.c ip_frag.c ip_nat.c ip_s
To: peter@spinner.DIALix.COM (Peter Wemm)
Date: Thu, 20 Feb 1997 15:29:25 +1100 (EST)
Cc: darrenr@freefall.freebsd.org, CVS-committers@freefall.freebsd.org,
        cvs-all@freefall.freebsd.org, cvs-user@freefall.freebsd.org
In-Reply-To: <199702200147.JAA01318@spinner.DIALix.COM> from "Peter Wemm" at Feb 20, 97 09:47:45 am
X-Mailer: ELM [version 2.4 PL23]
Content-Type: text
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

In some mail I received from Peter Wemm, sie wrote
> 
> Darren Reed wrote:
> > darrenr     97/02/19 05:49:58
> > 
> >   Modified:    contrib/ipfilter  HISTORY Makefile fil.c ip_fil.c ip_frag.c
> >                         ip_nat.c ip_state.c  ipl.h ipnat.c parse.c
> >                contrib/ipfilter/ipsend  44arp.c
> >   Log:
> >   update for revision 3.1.8
> >   
> >   Revision  Changes    Path
> >   1.2       +14 -0     src/contrib/ipfilter/HISTORY
> >   1.2       +2 -2      src/contrib/ipfilter/Makefile
> [..]
> 
> AARGH!!!  NOOOOOO!!!!  This was supposed to be done with 'cvs import'!
> 
> Well, that's totally FUBAR'd the vendor branch on all of the ipfilter 
> stuff, both within src/sys/netinet and in contrib now. :-(

Can someone explain the difference between import and commit ? (I've
never quite understood it except that import creates another branch ?).

As I understand it, I maybe wrong, if I checkout a branch and then
commit to that branch, it stays along the same branch, right ?

It's a minor number version upgrade, so, I think of it as being on
the same branch (for 3.1).

Darren