From dgl@kirk.dlee.org  Sun Dec 28 11:35:09 2003
Return-Path: <dgl@kirk.dlee.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3FF1016A4EA
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Dec 2003 11:35:09 -0800 (PST)
Received: from out003.verizon.net (out003pub.verizon.net [206.46.170.103])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6153E43D31
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Dec 2003 11:35:07 -0800 (PST)
	(envelope-from dgl@kirk.dlee.org)
Received: from kirk.dlee.org ([141.156.37.12]) by out003.verizon.net
          (InterMail vM.5.01.06.06 201-253-122-130-106-20030910) with ESMTP
          id <20031228193506.BEJI20713.out003.verizon.net@kirk.dlee.org>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Sun, 28 Dec 2003 13:35:06 -0600
Received: from kirk.dlee.org (dgl@localhost.dlee.org [127.0.0.1])
	by kirk.dlee.org (8.12.9p2/8.12.9) with ESMTP id hBSJZ5G9074715
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Dec 2003 14:35:05 -0500 (EST)
	(envelope-from dgl@kirk.dlee.org)
Received: (from dgl@localhost)
	by kirk.dlee.org (8.12.9p2/8.12.9/Submit) id hBSJZ58t074714;
	Sun, 28 Dec 2003 14:35:05 -0500 (EST)
	(envelope-from dgl)
Message-Id: <200312281935.hBSJZ58t074714@kirk.dlee.org>
Date: Sun, 28 Dec 2003 14:35:05 -0500 (EST)
From: Doug Lee <dgl@dlee.org>
Reply-To: Doug Lee <dgl@dlee.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Inconsistent diff output!
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         60663
>Category:       bin
>Synopsis:       Inconsistent diff output!
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 28 11:40:08 PST 2003
>Closed-Date:    Sun Dec 28 12:30:19 PST 2003
>Last-Modified:  Sun Dec 28 12:30:19 PST 2003
>Originator:     Doug Lee
>Release:        FreeBSD 4.9-RC i386
>Organization:
>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]

>Fix:

	


>Release-Note:
>Audit-Trail:

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 <dgl@dlee.org>
 >
 >   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
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Sun Dec 28 12:30:02 PST 2003 
State-Changed-Why:  
Closed at submitter's request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60663 
>Unformatted:
