Date: Thu, 14 Sep 1995 20:24:25 -0700 (PDT) From: "Rodney W. Grimes" <rgrimes@GndRsh.aac.dev.com> To: davidg@Root.COM Cc: CVS-commiters@freefall.freebsd.org, cvs-etc@freefall.freebsd.org Subject: Re: cvs commit: src/etc rc sysconfig Message-ID: <199509150324.UAA08768@GndRsh.aac.dev.com> In-Reply-To: <199509150147.SAA00186@corbin.Root.COM> from "David Greenman" at Sep 14, 95 06:47:45 pm
next in thread | previous in thread | raw e-mail | index | archive | help
> > >> > >> >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. I think you had better take a very close look at that, make a change in a place that there is a delta on the RELENG_2_1_0 branch and you will see that you above diff is between the head of the HEAD branch and your current copy of pstat.c. You can just make some little change to the file and have this validate your conclusion (which is incorrect) as that part of the file may very will be identical between -rHEAD and -rRELENG_2_1_0. I don't know why your being so confused on this issue. -rHEAD is a very special internal tag of cvs that always resolves to the head of the HEAD branch. The HEAD branch has no tag, but is what most people call the main branch or trunk. I suggest a good and complete reading of the cvs FAQ. -- Rod Grimes rgrimes@gndrsh.aac.dev.com Accurate Automation Company Reliable computers for FreeBSD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199509150324.UAA08768>