From owner-freebsd-commit Fri Sep 15 12:52:47 1995 Return-Path: owner-commit Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id MAA01203 for freebsd-commit-outgoing; Fri, 15 Sep 1995 12:52:47 -0700 Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id MAA01190 for cvs-all-outgoing; Fri, 15 Sep 1995 12:52:41 -0700 Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id MAA01179 for cvs-etc-outgoing; Fri, 15 Sep 1995 12:52:39 -0700 Received: from GndRsh.aac.dev.com (GndRsh.aac.dev.com [198.145.92.241]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id MAA01169 ; Fri, 15 Sep 1995 12:52:33 -0700 Received: (from rgrimes@localhost) by GndRsh.aac.dev.com (8.6.12/8.6.12) id MAA00326; Fri, 15 Sep 1995 12:52:15 -0700 From: "Rodney W. Grimes" Message-Id: <199509151952.MAA00326@GndRsh.aac.dev.com> Subject: Re: cvs commit: src/etc rc sysconfig To: jkh@time.cdrom.com (Jordan K. Hubbard) Date: Fri, 15 Sep 1995 12:52:15 -0700 (PDT) Cc: davidg@Root.COM, CVS-commiters@freefall.freebsd.org, cvs-etc@freefall.freebsd.org In-Reply-To: <7735.811139539@time.cdrom.com> from "Jordan K. Hubbard" at Sep 14, 95 09:32:19 pm X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Length: 936 Sender: owner-commit@FreeBSD.org Precedence: bulk > > > Well, then the behavior isn't consistent. Instead of doing the update, > > instead do the following: > > > > vi pstat.c > > (and make some stupid but identifiable change) > > cvs diff -c -rHEAD pstat.c > > > > The differences you see will be relative to the head of the RELENG_2_1_0 > > branch, NOT the head of the "main" branch. > > Ah, but I believe that's because `cvs diff' has long been broken. > > Try this, for an example: > > cvs co foo > cd foo > cvs diff -rRELENG_2_1_0 -rHEAD > > You'll see nothing. According to the man page, you're *supposed* to > be able to generate diffs against arbitrary tags, but it's certainly > never worked that way for me. Try his instead: (Much faster, saves the cvs co op :-)) cvs rdiff -rRELENG_2_1_0 -rHEAD foo -- Rod Grimes rgrimes@gndrsh.aac.dev.com Accurate Automation Company Reliable computers for FreeBSD