Date: Sun, 29 Jun 1997 23:46:21 PDT From: Bill Fenner <fenner@parc.xerox.com> 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 Message-ID: <97Jun29.234630pdt.177512@crevenia.parc.xerox.com> In-Reply-To: Your message of "Sun, 29 Jun 97 11:52:53 PDT." <199706291852.LAA26110@precipice.shockwave.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?97Jun29.234630pdt.177512>