From owner-freebsd-current Sat Jan 10 19:52:29 1998 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id TAA06237 for current-outgoing; Sat, 10 Jan 1998 19:52:29 -0800 (PST) (envelope-from owner-freebsd-current) Received: from spinner.netplex.com.au (root@spinner.netplex.com.au [202.12.86.3]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id TAA06138 for ; Sat, 10 Jan 1998 19:51:30 -0800 (PST) (envelope-from peter@netplex.com.au) Received: from spinner.netplex.com.au (peter@localhost [127.0.0.1]) by spinner.netplex.com.au (8.8.8/8.8.8/Spinner) with ESMTP id LAA21317; Sun, 11 Jan 1998 11:48:18 +0800 (WST) (envelope-from peter@spinner.netplex.com.au) Message-Id: <199801110348.LAA21317@spinner.netplex.com.au> X-Mailer: exmh version 2.0zeta 7/24/97 To: =?KOI8-R?B?4c7E0sXKIP7F0s7P1w==?= cc: Joerg Wunsch , Mike Smith , FreeBSD-current Subject: Re: CVS DIFF fix for review (-L added) In-reply-to: Your message of "Sun, 11 Jan 1998 01:30:23 +0300." Date: Sun, 11 Jan 1998 11:48:18 +0800 From: Peter Wemm Sender: owner-freebsd-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk =?KOI8-R?B?4c7E0sXKIP7F0s7P1w==?= wrote: > On Sat, 10 Jan 1998, J Wunsch wrote: > > > I didn't look into the code yet, but i was hoping something like > > > > run_setup("%s %s -L %s -L %s %s", ...) > > > > would work? > > Yes, it would be simpler. I write function keeping more complex labels > in mind, something like: \t (with embedded spaces), > then find that it is not neccessary. I'll make simplified version of > the patch and send it ASAP. One of the patches you posted had the wrong number of arguments to run_setup. You added two %s to the formats, but only added one extra argument. Remember, this section of code is completely different in the current CVS, as it calls an internal diff library rather than fork/exec/run-rcsdiff. peter@spinner[10:56am]~src-155> cvs --version Concurrent Versions System (CVS) 1.9.23 (client/server) [...] > > Also, i'm not sure, but IMHO the Index: lines should be dropped then. > > They are obsolete at best, and confusing at worst. > > Index: lines still needed for ed-style diffs. Such case detection adds > more code. > > -- > Andrey A. Chernov > > http://www.nagual.pp.ru/~ache/ > Cheers, -Peter -- Peter Wemm Netplex Consulting