From owner-cvs-contrib  Sun Jun 29 23:47:50 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id XAA08179
          for cvs-contrib-outgoing; Sun, 29 Jun 1997 23:47:50 -0700 (PDT)
Received: from alpha.xerox.com (alpha.Xerox.COM [13.1.64.93])
          by hub.freebsd.org (8.8.5/8.8.5) with SMTP id XAA08135;
          Sun, 29 Jun 1997 23:47:09 -0700 (PDT)
Received: from crevenia.parc.xerox.com ([13.2.116.11]) by alpha.xerox.com with SMTP id <15830(5)>; Sun, 29 Jun 1997 23:46:35 PDT
Received: from localhost by crevenia.parc.xerox.com with SMTP id <177512>; Sun, 29 Jun 1997 23:46:30 -0700
To: Paul Traina <pst@shockwave.com>
cc: "Jonathan M. Bresler" <jmb@freebsd.org>, steve@freebsd.org,
        cvs-committers@freebsd.org, cvs-all@freebsd.org,
        cvs-contrib@freebsd.org
Subject: Re: cvs commit: src/contrib/patch ChangeLog Makefile.in NEWS acconfig.h backupfile.c common.h config.hin configure configure.in 
In-reply-to: Your message of "Sun, 29 Jun 97 11:52:53 PDT."
             <199706291852.LAA26110@precipice.shockwave.com> 
Date: Sun, 29 Jun 1997 23:46:21 PDT
From: Bill Fenner <fenner@parc.xerox.com>
Message-Id: <97Jun29.234630pdt.177512@crevenia.parc.xerox.com>
Sender: owner-cvs-contrib@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

Paul Traina <pst@shockwave.com> wrote:
>	cvs co -jFSF:yesterday -jFSF contrib_patch

Not if you did both imports in one day.  I was trying to build up
history in a local CVS tree and discovered that the "foo:yesterday"
trick doesn't work if the previous rev that the conflicts are with was
imported today.  Thus, the proper thing here is sometimes to do

	cvs co -jv2_3 -jv2_4 contrib_patch

(e.g. use the release tags instead of the branch tag and the
:yesterday kludge).

(Or, the other way to solve this is don't import two things on
the same day...)

  Bill