From owner-cvs-gnu  Sat Oct 28 14:07:55 1995
Return-Path: owner-cvs-gnu
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id OAA26894
          for cvs-gnu-outgoing; Sat, 28 Oct 1995 14:07:55 -0700
Received: (from peter@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id OAA26870
          ; Sat, 28 Oct 1995 14:07:43 -0700
Date: Sat, 28 Oct 1995 14:07:43 -0700
From: Peter Wemm <peter>
Message-Id: <199510282107.OAA26870@freefall.freebsd.org>
To: CVS-commiters, cvs-gnu
Subject: cvs commit: src/gnu/usr.bin/rcs - Imported sources
Sender: owner-cvs-gnu@FreeBSD.org
Precedence: bulk

peter       95/10/28 14:07:41

  Branch:      gnu/usr.bin/rcs  1.1.1
  Log:
  Import rcs-5.7, required for full support of cvs-1.6.
  
  This is going to be pretty messy....  Although the vendor import was correct,
  both the vendor and release tags are the same "gnu"... :-/
  Getting cvs to choose the correct one might be rather interesting...
  
  Status:
  
  Vendor Tag:	GNU
  Release Tags:	rcs_5_7
  
  C src/gnu/usr.bin/rcs/Makefile
  C src/gnu/usr.bin/rcs/Makefile.inc
  N src/gnu/usr.bin/rcs/REFS
  N src/gnu/usr.bin/rcs/NEWS
  N src/gnu/usr.bin/rcs/CREDITS
  U src/gnu/usr.bin/rcs/rcstest
  U src/gnu/usr.bin/rcs/doc/rcs_func.ms
  U src/gnu/usr.bin/rcs/doc/rcs.ms
  C src/gnu/usr.bin/rcs/ci/ci.c
  U src/gnu/usr.bin/rcs/ci/ci.1
  C src/gnu/usr.bin/rcs/ci/Makefile
  C src/gnu/usr.bin/rcs/co/co.1
  C src/gnu/usr.bin/rcs/co/co.c
  C src/gnu/usr.bin/rcs/co/Makefile
  U src/gnu/usr.bin/rcs/ident/ident.1
  C src/gnu/usr.bin/rcs/ident/ident.c
  C src/gnu/usr.bin/rcs/ident/Makefile
  C src/gnu/usr.bin/rcs/lib/conf.h
  C src/gnu/usr.bin/rcs/lib/maketime.c
  U src/gnu/usr.bin/rcs/lib/merger.c
  C src/gnu/usr.bin/rcs/lib/partime.c
  C src/gnu/usr.bin/rcs/lib/rcsbase.h
  C src/gnu/usr.bin/rcs/lib/rcsedit.c
  C src/gnu/usr.bin/rcs/lib/rcsfcmp.c
  C src/gnu/usr.bin/rcs/lib/rcsfnms.c
  C src/gnu/usr.bin/rcs/lib/rcsgen.c
  C src/gnu/usr.bin/rcs/lib/rcskeep.c
  C src/gnu/usr.bin/rcs/lib/rcskeys.c
  C src/gnu/usr.bin/rcs/lib/rcslex.c
  U src/gnu/usr.bin/rcs/lib/rcsmap.c
  C src/gnu/usr.bin/rcs/lib/rcsrev.c
  C src/gnu/usr.bin/rcs/lib/rcssyn.c
  C src/gnu/usr.bin/rcs/lib/rcsutil.c
  N src/gnu/usr.bin/rcs/lib/version.c
  N src/gnu/usr.bin/rcs/lib/maketime.h
  N src/gnu/usr.bin/rcs/lib/partime.h
  N src/gnu/usr.bin/rcs/lib/rcstime.c
  C src/gnu/usr.bin/rcs/lib/Makefile
  U src/gnu/usr.bin/rcs/merge/merge.1
  U src/gnu/usr.bin/rcs/merge/merge.c
  C src/gnu/usr.bin/rcs/merge/Makefile
  U src/gnu/usr.bin/rcs/rcs/rcs.1
  C src/gnu/usr.bin/rcs/rcs/rcs.c
  U src/gnu/usr.bin/rcs/rcs/rcsfile.5
  U src/gnu/usr.bin/rcs/rcs/rcsintro.1
  C src/gnu/usr.bin/rcs/rcs/Makefile
  U src/gnu/usr.bin/rcs/rcsclean/rcsclean.1
  U src/gnu/usr.bin/rcs/rcsclean/rcsclean.c
  C src/gnu/usr.bin/rcs/rcsclean/Makefile
  U src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
  C src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
  C src/gnu/usr.bin/rcs/rcsdiff/Makefile
  U src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
  U src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
  C src/gnu/usr.bin/rcs/rcsfreeze/Makefile
  U src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
  C src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
  C src/gnu/usr.bin/rcs/rcsmerge/Makefile
  C src/gnu/usr.bin/rcs/rlog/rlog.1
  C src/gnu/usr.bin/rcs/rlog/rlog.c
  C src/gnu/usr.bin/rcs/rlog/Makefile
  
  36 conflicts created by this import.
  Use the following command to help the merge:
  
  	ccvs checkout -jGNU:yesterday -jGNU src/gnu/usr.bin/rcs