From owner-freebsd-bugs  Sat May 25 02:45:17 1996
Return-Path: owner-bugs
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA25942
          for bugs-outgoing; Sat, 25 May 1996 02:45:17 -0700 (PDT)
Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id CAA25932
          for <freebsd-bugs@freefall.freebsd.org>; Sat, 25 May 1996 02:45:13 -0700 (PDT)
Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.12/8.6.9) id TAA11691; Sat, 25 May 1996 19:42:38 +1000
Date: Sat, 25 May 1996 19:42:38 +1000
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199605250942.TAA11691@godzilla.zeta.org.au>
To: freebsd-bugs@freefall.freebsd.org, j@uriah.heep.sax.de
Subject: Re: bin/1248: shell having problem parsing arguments
Sender: owner-bugs@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

> > Index: parser.c
> > ===================================================================
> > RCS file: /home/ncvs/src/bin/sh/parser.c,v
> > retrieving revision 1.11
> > diff -r1.11 parser.c
> > 1111,1112c1111,1120
> > < 			USTPUTC(c, out);
> > < 			c = pgetc();
> > ---
> > > 			
> > > 			if (is_digit(c)) {
> > > 				do {
> 
> Aw!  Can you please re-submit this as a context (or uni) diff?
> (The -c or -u flags to [cvs] diff.)  It's nearly impossible to
> integrate plain diffs.

Actually, it's very easy to integrate plain diffs, especially if they
have an Index line, provided you have the original version, and CVS
supplies the original version.

Context diffs are just easier to understand when you don't have the
original sources to refer to.

Bruce