Date: Thu, 20 Feb 1997 15:29:25 +1100 (EST) From: Darren Reed <darrenr@cyber.com.au> To: peter@spinner.DIALix.COM (Peter Wemm) Cc: darrenr@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-user@freefall.freebsd.org 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 Message-ID: <199702200429.PAA01648@plum.cyber.com.au> In-Reply-To: <199702200147.JAA01318@spinner.DIALix.COM> from "Peter Wemm" at Feb 20, 97 09:47:45 am
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199702200429.PAA01648>