From owner-cvs-sys  Sun Jan  5 22:45:55 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id WAA14099
          for cvs-sys-outgoing; Sun, 5 Jan 1997 22:45:55 -0800 (PST)
Received: from rover.village.org (rover.village.org [204.144.255.49])
          by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id WAA14017;
          Sun, 5 Jan 1997 22:45:22 -0800 (PST)
Received: from rover.village.org [127.0.0.1] 
	by rover.village.org with esmtp (Exim 0.56 #1)
	id E0vh8no-0003gi-00; Sun, 5 Jan 1997 23:44:56 -0700
To: dg@root.com
Subject: Re: cvs commit: src/sys/i386/isa/bs bs.c bs_isa.c bs_pisa.c bsfunc.c bsfunc.h bshw.c bshw.h bshw.lst bshw_dma.c bshw_pdma.c bsvar.h ccbque.h dvcfg.h scsi_dvcfg.h 
Cc: "Jordan K. Hubbard" <jkh@time.cdrom.com>,
        Stephen McKay <syssgm@devetir.qld.gov.au>,
        CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org,
        cvs-sys@freefall.freebsd.org
In-reply-to: Your message of "Sun, 05 Jan 1997 22:14:39 PST."
		<199701060614.WAA00766@root.com> 
References: <199701060614.WAA00766@root.com>  
Date: Sun, 05 Jan 1997 23:44:56 -0700
From: Warner Losh <imp@village.org>
Message-Id: <E0vh8no-0003gi-00@rover.village.org>
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

In message <199701060614.WAA00766@root.com> David Greenman writes:
:    I've asked people to look at the $Id$ in their source file and confirm
: that it was a specific rev at least a dozen times since the start of the
: project 4 years ago. It has been a very valuable thing when I needed it.
: I do agree that it can be a pain, however, and I certainly understand
: the viewpoint that it is more trouble than it's worth.

I have many times been able to merge in changes from FreeBSD into
OpenBSD and vice versa because the ID number showed me *EXACTLY* where
the branches had happened, and what I needed to grab from CVS to get
back and what patches I needed to apply.  This is a good thing.

None of the other $*BSD$ keywords expand, and at most they create a
minor addition to the diffs that are generated.

I have also used $ID$ many many times to update my /etc/ files to
preserve my local changes.  This has been quite useful and saved me
hours of frustration.

The $Id:$ that cause the most problems are those from other things
where you must preserve the original $Id$ in order for things to merge
right later.  I admit that is a problem that needs a solution, but
completely removing the $id$ from our sources isn't that solution.  It
won't help the case that is really the problem, and it will make it
harder for others to merge our software.

Just my two cents.  You can tell Jordan and I differ as to what needs
to happen here :-)

Warner