From owner-freebsd-current Sat Jan 10 10:53:16 1998 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id KAA00245 for current-outgoing; Sat, 10 Jan 1998 10:53:16 -0800 (PST) (envelope-from owner-freebsd-current) Received: from sax.sax.de (sax.sax.de [193.175.26.33]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id KAA00163; Sat, 10 Jan 1998 10:52:41 -0800 (PST) (envelope-from j@uriah.heep.sax.de) Received: (from uucp@localhost) by sax.sax.de (8.8.8/8.8.8) with UUCP id TAA00837; Sat, 10 Jan 1998 19:52:22 +0100 (CET) (envelope-from j@uriah.heep.sax.de) Received: (from j@localhost) by uriah.heep.sax.de (8.8.8/8.8.5) id TAA19245; Sat, 10 Jan 1998 19:50:08 +0100 (MET) Message-ID: <19980110195007.31038@uriah.heep.sax.de> Date: Sat, 10 Jan 1998 19:50:07 +0100 From: J Wunsch To: =?iso-8859-1?Q?=E1=CE=C4=D2=C5=CA_=FE=C5=D2=CE=CF=D7?= Cc: Mike Smith , FreeBSD-current , peter@FreeBSD.ORG Subject: Re: CVS DIFF fix for review (-L added) Reply-To: Joerg Wunsch References: <199801071350.AAA01279@word.smith.net.au> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Mailer: Mutt 0.88 In-Reply-To: =?iso-8859-1?Q?=3CPine=2EBSF=2E3=2E96=2E980110190329=2E27770A-100000=40l?= =?iso-8859-1?Q?sd=2Erelcom=2Eeu=2Enet=3E=3B_from_=E1=CE=C4=D2=C5=CA_=FE?= =?iso-8859-1?Q?=C5=D2=CE=CF=D7_on_Sat=2C_Jan_10=2C_1998_at_07=3A11=3A31P?= =?iso-8859-1?Q?M_+0300?= X-Phone: +49-351-2012 669 X-PGP-Fingerprint: DC 47 E6 E4 FF A6 E9 8F 93 21 E0 7D F9 12 D6 4E Sender: owner-freebsd-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk As Андрей Чернов wrote: > Since Index: is dead for context diffs, here is a patch to correct ***/--- > pathnames generated by CVS (now using -L diff option like in rcsdiff). > > Since I not run CVS and don't know how to do its minimal setup, please > test and check is it really fix the problem. (Well, you could always test it on freefall. ;) > + run_setup ("%s %s", DIFF, opts); > + run_arg (set_diff_label (DEVNULL)); > + run_arg (set_diff_label (finfo->fullname)); > + run_arg (DEVNULL); > + run_arg (fn); 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? Also, i'm not sure, but IMHO the Index: lines should be dropped then. They are obsolete at best, and confusing at worst. -- cheers, J"org joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE Never trust an operating system you don't have sources for. ;-)