From owner-cvs-sbin  Fri Feb 23 11:44:53 1996
Return-Path: owner-cvs-sbin
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA02923
          for cvs-sbin-outgoing; Fri, 23 Feb 1996 11:44:53 -0800 (PST)
Received: from GndRsh.aac.dev.com (GndRsh.aac.dev.com [198.145.92.241])
          by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id LAA02912
          Fri, 23 Feb 1996 11:44:48 -0800 (PST)
Received: (from rgrimes@localhost) by GndRsh.aac.dev.com (8.6.12/8.6.12) id LAA11419; Fri, 23 Feb 1996 11:44:37 -0800
From: "Rodney W. Grimes" <rgrimes@GndRsh.aac.dev.com>
Message-Id: <199602231944.LAA11419@GndRsh.aac.dev.com>
Subject: Re: cvs commit: src/sbin/rdisc rdisc.8 rdisc.c DISCLAIMER
To: peter@jhome.DIALix.COM (Peter Wemm)
Date: Fri, 23 Feb 1996 11:44:36 -0800 (PST)
Cc: pst@freefall.freebsd.org, CVS-committers@freefall.freebsd.org,
        cvs-all@freefall.freebsd.org, cvs-sbin@freefall.freebsd.org
In-Reply-To: <199602231830.CAA06130@jhome.DIALix.COM> from "Peter Wemm" at Feb 24, 96 02:30:40 am
X-Mailer: ELM [version 2.4 PL24]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-sbin@FreeBSD.ORG
Precedence: bulk

> 
> >> 
> >> pst         96/02/23 10:04:37
> >> 
> >>   Modified:    sbin/rdisc  rdisc.8 rdisc.c
> >>   Removed:     sbin/rdisc  DISCLAIMER
> >>   Log:
> >>   Bring in router discovery from -current
> >>   
> >>   Revision  Changes    Path
> >>   1.1.1.1.6.1 +22 -23    src/sbin/rdisc/rdisc.8
> >>   1.2.4.1   +225 -189  src/sbin/rdisc/rdisc.c
> >
> >Looks like you missed... this did _not_ commit onto the -stable branch.
> 
> It did (the rcsid's confirm it), but for some reason the branch was not logged.
> 
> I'd be interested to know how Paul managed this, but I think this has happen
> before if the person does a:
> "cvs update -r RELENG_2_1_0 *"
> 
> What that means, is that each file has a sticky tag in the CVS/Entries file,
> but the directory itself (ie: CVS/Tag) doesn't, and log_accum doesn't pick
> that up.
> 
> Well, that's my theory anyway..

>From some quick checking here your theory works for me, with a small
problem or two ... :-)

Hummm.. cvs update -r RELENG_2_1_0 * is dangerous:

SkyRsh# cvs update -r RELENG_2_1_0 *
cvs update: Makefile is no longer in the repository
U rdisc.8
U rdisc.c
cvs [update aborted]: cannot open CVS/CVS/Tag: No such file or directory

But cvs update -r RELENG file1 file2 ... does infact do what you
describe...

-- 
Rod Grimes                                      rgrimes@gndrsh.aac.dev.com
Accurate Automation Company                 Reliable computers for FreeBSD