From owner-freebsd-commit Thu Sep 14 18:46:51 1995 Return-Path: owner-commit Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id SAA10866 for freebsd-commit-outgoing; Thu, 14 Sep 1995 18:46:51 -0700 Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id SAA10854 for cvs-all-outgoing; Thu, 14 Sep 1995 18:46:48 -0700 Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id SAA10844 for cvs-etc-outgoing; Thu, 14 Sep 1995 18:46:47 -0700 Received: from Root.COM (implode.Root.COM [198.145.90.17]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id SAA10839 ; Thu, 14 Sep 1995 18:46:41 -0700 Received: from corbin.Root.COM (corbin [198.145.90.34]) by Root.COM (8.6.12/8.6.5) with ESMTP id SAA08178; Thu, 14 Sep 1995 18:45:27 -0700 Received: from localhost (localhost [127.0.0.1]) by corbin.Root.COM (8.6.12/8.6.5) with SMTP id SAA00186; Thu, 14 Sep 1995 18:47:45 -0700 Message-Id: <199509150147.SAA00186@corbin.Root.COM> To: "Rodney W. Grimes" cc: CVS-commiters@freefall.freebsd.org, cvs-etc@freefall.freebsd.org Subject: Re: cvs commit: src/etc rc sysconfig In-reply-to: Your message of "Thu, 14 Sep 95 18:41:00 PDT." <199509150141.SAA08604@GndRsh.aac.dev.com> From: David Greenman Reply-To: davidg@Root.COM Date: Thu, 14 Sep 1995 18:47:45 -0700 Sender: owner-commit@FreeBSD.org Precedence: bulk >> >> >I think you are the one confused here, there is no cvs branch called >> >``main branch''. cvs commands using -rHEAD are with respect to what most >> >folks call the main branch, correct terminolgy is the HEAD branch. >> >> That is NOT correct. cvs operations refering to -rHEAD refer to the most >> recent version of the relevant branch. It only refers to the most recent >> version of the "main" branch when that is the branch it was checked out from >> (or in other words has no sticky tag). > >Try again.. and to prove your self wrong try these commands: > >cvs co -rRELENG_2_1_0 pstat >cd pstat >cvs update -rHEAD >cvs status pstat.c 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. -DG