Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Sep 1995 22:27:20 +1000
From:      Bruce Evans <bde@zeta.org.au>
To:        CVS-commiters@freefall.freebsd.org, cvs-sys@freefall.freebsd.org, wollman@freefall.freebsd.org
Subject:   Re: cvs commit: src/sys/netinet - Imported sources
Message-ID:  <199509221227.WAA05748@godzilla.zeta.org.au>

next in thread | raw e-mail | index | archive | help
>  Branch:      sys/netinet  1.1.1
>  Log:
>  Second try: get 4.4-Lite-2 into the source tree.  The conflicts don't
>  matter because none of our working source files are on the CSRG branch
>  any more.
>  
>  Obtained from:	4.4BSD-Lite-2
>  
>  Status:
>  
>  Vendor Tag:	CSRG
>  Release Tags:	bsd_44_lite_2

Are we going to do this for all of 4.4lite2?  The diffs (-rc) relative to
4.4lite (as obtained from `cvs export -r CSRG') are fairly small:

   lines   words  chars files-changed
                                      admin		# not imported
   14228   46970  313723    107       bin
                                      contrib		# not imported
                                      etc		# not imported
                                      games		# unimportant
     302    1406    9490      7       include
                                      kerberosIV	# restricted
   10329   39504  278236    115       lib
    3543   12116   87684     19       libexec
                                      local		# not imported
                                      old		# not imported
   16976   60106  425973    101       sbin
   15621   78975  468874     73       share
   85619  325267 2277316    351       sys
   23702   85964  605760    223       usr.bin
   76640  380390 2473294    281       usr.sbin
  246960 1030698 6940350   1277       total

Most of the big diffs in usr.sbin are for sendmail.  We already have
most of these.  Similar big diffs for nvi are not shown above because
nvi is in contrib.  Many of the file changes are solely for munged
$Id$'s.  Most of the diffs outside of sys will be easy to merge (more
than half are for documentation, especially in sendmail for *.ps).

Bruce



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199509221227.WAA05748>