From owner-freebsd-bugs@FreeBSD.ORG Sun Dec 28 11:50:22 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B98F416A57B for ; Sun, 28 Dec 2003 11:50:22 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2914B43D45 for ; Sun, 28 Dec 2003 11:50:21 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) hBSJoLFR063733 for ; Sun, 28 Dec 2003 11:50:21 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id hBSJoKvt063729; Sun, 28 Dec 2003 11:50:20 -0800 (PST) (envelope-from gnats) Date: Sun, 28 Dec 2003 11:50:20 -0800 (PST) Message-Id: <200312281950.hBSJoKvt063729@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org From: dgl@dlee.org Subject: CANCEL (Re: bin/60663: Inconsistent diff output!) X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: dgl@dlee.org List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 19:50:23 -0000 The following reply was made to PR bin/60663; it has been noted by GNATS. From: dgl@dlee.org To: freebsd-gnats-submit@FreeBSD.org, dgl@dlee.org Cc: dgl@dlee.org Subject: CANCEL (Re: bin/60663: Inconsistent diff output!) Date: Sun, 28 Dec 2003 14:47:45 -0500 (EST) Please cancel this; I missed the .# on the .#modules file names in my haste and failed to notice the real comparisons about 600 lines below that. My most sincere and embarrassed apologies! The rest of my ill-aimed PR follows, in Lynx format... > Navigation Bar > > Problem Report bin/60663 > > Inconsistent diff output! > > Confidential > no > > Severity > serious > > Priority > high > > Responsible > freebsd-bugs@FreeBSD.org > > State > open > > Class > sw-bug > > Submitter-Id > current-users > > Arrival-Date > Sun Dec 28 11:40:08 PST 2003 > > Last-Modified > never > > Originator > Doug Lee > > Release > FreeBSD 4.9-RC i386 > > Environment > >System: FreeBSD kirk.dlee.org 4.9-RC FreeBSD 4.9-RC #0: Sat Oct 4 05:16:52 EDT >2003 dgl@kirk.dlee.org:/usr2/obj/usr/src/sys/CUSTOM i386 > > > > Description > >I have two subdirectories (CVSROOT copies, actually) for which I get >inconsistent results as follows: > >If I diff the "modules" files alone, I get correct output; but if I >diff the whole directories (with or without -r), the output for >"modules" is wrong: It leaves out one line and acts as if it misses >one line of one of the input files. NOTE: This is /usr/bin/diff, NOT >"cvs diff." I haven't tried CVS's built-in diff here. > > How-To-Repeat > >Given directories cv1 and cv2 (I'll provide a tar file to whichever >tester requests it), the first of the following commands produces >correct output, while the second omits a line as shown: > >% diff cv1/modules cv2/modules >28,33c28,29 >< # These modules are Bart projects now being managed by CVS. >< bx bart/bx >< delta bart/delta >< dt -a delta >< lib bart/lib >< qex bart/qex >--- >> dbin -d bin dgl/develop/bin >> cc shepherd/chatclient > >% diff cv1 cv2 >diff cv1/.#cvsignore cv2/.#cvsignore >2d1 >< ex.rc EX.RC >diff cv1/.#cvswrappers cv2/.#cvswrappers >19a20 >> >24,31c25,28 >< *.mpg -k 'b' >< *.MPG -k 'b' >< *.jpeg -k 'b' >< *.JPEG -k 'b' >< *.mpeg -k 'b' >< *.MPEG -k 'b' >< *.jsb -k 'b' >< *.JSB -k 'b' >--- >> *.mp3 -k 'b' >> *.MP3 -k 'b' >> *.wav -k 'b' >> *.WAV -k 'b' >diff cv1/.#modules cv2/.#modules >28,32c28 >[*** WRONG *** should be 28,33c28,29] >< # These modules are Bart projects now being managed by CVS. >< bx bart/bx >< delta bart/delta >< dt -a delta >< qex bart/qex >[*** WRONG *** skipped the "lib bart/lib" line] >--- >> dbin -d bin dgl/develop/bin >[*** WRONG *** there should be one more line] >Common subdirectories: cv1/Emptydir and cv2/Emptydir >[...further lines of output omitted] > > Submit Followup | Raw PR > _________________________________________________________________ > > > www@FreeBSD.org