From owner-freebsd-current  Tue Feb  6 20:45:49 1996
Return-Path: owner-current
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id UAA21575
          for current-outgoing; Tue, 6 Feb 1996 20:45:49 -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 UAA21545
          Tue, 6 Feb 1996 20:45:38 -0800 (PST)
Received: (from rgrimes@localhost) by GndRsh.aac.dev.com (8.6.12/8.6.12) id UAA25414; Tue, 6 Feb 1996 20:45:04 -0800
From: "Rodney W. Grimes" <rgrimes@GndRsh.aac.dev.com>
Message-Id: <199602070445.UAA25414@GndRsh.aac.dev.com>
Subject: Re: FS PATCHES: THE NEXT GENERATION
To: terry@lambert.org (Terry Lambert)
Date: Tue, 6 Feb 1996 20:45:04 -0800 (PST)
Cc: julian@ref.tfs.com, terry@lambert.org, current@freebsd.org,
        hackers@freebsd.org
In-Reply-To: <199602070026.RAA03938@phaeton.artisoft.com> from "Terry Lambert" at Feb 6, 96 05:26:27 pm
X-Mailer: ELM [version 2.4 PL24]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-current@freebsd.org
Precedence: bulk

> 
> > Ah yes but:
> > now that you have a sup+cvs setup, you can keep your diff sets up-to date
> > relatively easily, and if you send them as diffs
> > then there is a good chance that even if there is a time-lag induced
> > collision, it will be caught and fixed, 
> > also many files get changes that are automatically resolved..
> 
> I have uploaded a FS_PATCHED.diff.gz to incoming on freefall.
> 
> This was generated with "cvs diff -c" in /sys.
> 
> The output doesn't look particularly useful as input to "patch", unless
> you write an awk/perl script to reformat the "cvs diff" file information
> (this seems to be more work than checking out a spamable tree).

The output of cvs diff -c should be very usable by patch, that is what
the Index lines are added for.  There use to be problems in that patch
would pick the wrong path to the file, this has been fixed in a recent
version of patch that gives the Index line higher precedence than the
other pathnames.
 
> > > I can provide the changes as diffs if you need them that way; I'll warn
> > > you that you'll be in exactly the same boat applying them as the original
> > > diff sets I sent (that's why I went to the trouble of sup + cvs + ...).
> > 
> > err why?
> 
> See above.  "cvs diff -c" does not result in a file that can be used as
> input to "patch" without some post-processing.

If this is true again then either cvs or patch needs some work.  


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