From owner-cvs-bin  Sun May 26 18:41:26 1996
Return-Path: owner-cvs-bin
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id SAA06400
          for cvs-bin-outgoing; Sun, 26 May 1996 18:41:26 -0700 (PDT)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id SAA06357;
          Sun, 26 May 1996 18:41:14 -0700 (PDT)
Date: Sun, 26 May 1996 18:41:14 -0700 (PDT)
From: Peter Wemm <peter>
Message-Id: <199605270141.SAA06357@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-bin
Subject: cvs commit:  src/bin/sh - Imported sources
Sender: owner-cvs-bin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       96/05/26 18:41:13

  src/bin/sh - Imported sources
  Update of /home/ncvs/src/bin/sh
  In directory freefall.freebsd.org:/tmp/cvs-serv4601
  
  Revision/Branch: 1.1.1
  
  Log Message:
  Import the 4.4BSD-Lite2 /bin/sh sources
  
  Requested by: joerg
  
  (Note, this is mostly going to be conflicts, which is expected.  Our entire
   sh source has a mainline, so this should not change anything except for
   a few new files appearing.  I dont think they are a problem)
  
  Status:
  
  Vendor Tag:	CSRG
  Release Tags:	bsd_4_4_lite_2
  		
  C src/bin/sh/alias.c
  C src/bin/sh/alias.h
  N src/bin/sh/arith.h
  C src/bin/sh/arith.y
  C src/bin/sh/arith_lex.l
  N src/bin/sh/builtins.def
  C src/bin/sh/cd.c
  C src/bin/sh/error.c
  C src/bin/sh/error.h
  C src/bin/sh/eval.c
  C src/bin/sh/eval.h
  C src/bin/sh/exec.c
  C src/bin/sh/exec.h
  C src/bin/sh/expand.c
  C src/bin/sh/expand.h
  C src/bin/sh/histedit.c
  C src/bin/sh/init.h
  C src/bin/sh/input.c
  C src/bin/sh/input.h
  C src/bin/sh/jobs.c
  C src/bin/sh/jobs.h
  C src/bin/sh/machdep.h
  C src/bin/sh/mail.c
  C src/bin/sh/mail.h
  C src/bin/sh/main.c
  C src/bin/sh/main.h
  C src/bin/sh/Makefile
  C src/bin/sh/memalloc.c
  C src/bin/sh/memalloc.h
  C src/bin/sh/miscbltin.c
  C src/bin/sh/mkbuiltins
  C src/bin/sh/mkinit.c
  C src/bin/sh/mknodes.c
  C src/bin/sh/mksyntax.c
  U src/bin/sh/mktokens
  C src/bin/sh/myhistedit.h
  C src/bin/sh/mystring.c
  C src/bin/sh/mystring.h
  C src/bin/sh/nodes.c.pat
  C src/bin/sh/nodetypes
  C src/bin/sh/options.c
  C src/bin/sh/options.h
  C src/bin/sh/output.c
  C src/bin/sh/output.h
  C src/bin/sh/parser.c
  C src/bin/sh/parser.h
  C src/bin/sh/redir.c
  C src/bin/sh/redir.h
  C src/bin/sh/sh.1
  C src/bin/sh/shell.h
  C src/bin/sh/show.c
  N src/bin/sh/show.h
  U src/bin/sh/TOUR
  C src/bin/sh/trap.c
  C src/bin/sh/trap.h
  C src/bin/sh/var.c
  C src/bin/sh/var.h
  N src/bin/sh/CVS/Repository
  N src/bin/sh/CVS/Entries
  C src/bin/sh/bltin/bltin.h
  C src/bin/sh/bltin/echo.1
  C src/bin/sh/bltin/echo.c
  N src/bin/sh/bltin/CVS/Repository
  N src/bin/sh/bltin/CVS/Entries
  C src/bin/sh/funcs/cmv
  C src/bin/sh/funcs/dirs
  C src/bin/sh/funcs/kill
  C src/bin/sh/funcs/login
  C src/bin/sh/funcs/newgrp
  C src/bin/sh/funcs/popd
  C src/bin/sh/funcs/pushd
  C src/bin/sh/funcs/suspend
  N src/bin/sh/funcs/CVS/Repository
  N src/bin/sh/funcs/CVS/Entries
  
  63 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jCSRG:yesterday -jCSRG src/bin/sh