From MAILER-DAEMON Sun May 01 21:28:26 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ax2ew-00088Q-Nu
	for mharc-bug-diffutils@gnu.org; Sun, 01 May 2016 21:28:26 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33299)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ax2eo-0007uW-5A
	for bug-diffutils@gnu.org; Sun, 01 May 2016 21:28:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ax2ec-0007Zb-7b
	for bug-diffutils@gnu.org; Sun, 01 May 2016 21:28:12 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:48800)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ax2eb-0007XP-1q
	for bug-diffutils@gnu.org; Sun, 01 May 2016 21:28:06 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ax2eX-0002mq-Ls
	for bug-diffutils@gnu.org; Sun, 01 May 2016 21:28:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 02 May 2016 01:28:01 +0000
Resent-Message-ID: <handler.21665.B21665.146215245010674@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 21665
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Maurice van der Pot <griffon26@kfk4ever.com>
Cc: 21665@debbugs.gnu.org
Received: via spool by 21665-submit@debbugs.gnu.org id=B21665.146215245010674
	(code B ref 21665); Mon, 02 May 2016 01:28:01 +0000
Received: (at 21665) by debbugs.gnu.org; 2 May 2016 01:27:30 +0000
Received: from localhost ([127.0.0.1]:32904 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1ax2e2-0002m6-9s
	for submit@debbugs.gnu.org; Sun, 01 May 2016 21:27:30 -0400
Received: from mail-oi0-f65.google.com ([209.85.218.65]:35486)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1ax2e0-0002lt-It
	for 21665@debbugs.gnu.org; Sun, 01 May 2016 21:27:28 -0400
Received: by mail-oi0-f65.google.com with SMTP id w198so21577074oiw.2
	for <21665@debbugs.gnu.org>; Sun, 01 May 2016 18:27:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc;
	bh=bpGtrFVUHSWlNN2Qam+m4nMc541GkQwzwWZ4TJEixww=;
	b=p4lzX3SPkhDpyov+tbR9gZH/WuwjscXo9uHK44eMh+JFlKtsYPK+K9tV4YRfKjQ3Hs
	RWTdd+BGZjUHz2pZMsTCH6//wEv6x4Eweam9ZLwaUFgNu4dwHT8DREfq76hnToNw5yWo
	2f1CqWdi50P8mbB7kVieyvS60ty8ne0aHcabLsQdPQYwpkYmtniRl1FAoEY07Fklz6Lj
	MJxMSn+pxWq1ZOfcmZ+q9+h5s6CpJVSCuAqhCJEEDdQZ+vApOeBetSMDk0Z68qm+CuAW
	jK2flq+exVYPy1lql4sA2Y/ZfbuWCj9ziAYcOVLxXYjamGBBkpeIANGi45twKyax/8JT
	k1Fg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc;
	bh=bpGtrFVUHSWlNN2Qam+m4nMc541GkQwzwWZ4TJEixww=;
	b=D6XuMG9acPaRabKK9NN3tcXQSwO4X2X33/wDpUhtuWQdUw0Eo3qOEY7VbEJ9D9r5Vu
	c9IpF1gGS8V5dvaELLclLCGgqWoHOfe9o+qtLvWfZWDP8hbZvHM+ISNu/w4ey81VA+qZ
	Znf2HGDdgLlK9+Q+2DuaozHqjVlx1Yl3iGn3xHBtwVZigchxpELDGl5KAZnR9vJiGbJA
	PAofj9/C+VhqKT6lTLz8gu61Zj03YFU60+OnKjuOCL5byQGSkPeOrzO2HThwuFEcB+Np
	X5pfwDSs958zmy/xh8GVYLpf+wTCj7w6gOosjfVgKOwai0i18cufc1BD7wstywP0bEsr
	B3kQ==
X-Gm-Message-State: AOPr4FVp/nc1Q/uTjobVH/zafTCtVSxxUAK1tkyuf9TspagHinEACJQUufbWKLXeOdPKw+m7Pfh7mJ5UbddTZA==
X-Received: by 10.157.62.181 with SMTP id b50mr10792480otc.163.1462152443057; 
	Sun, 01 May 2016 18:27:23 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.175.193 with HTTP; Sun, 1 May 2016 18:27:03 -0700 (PDT)
In-Reply-To: <20151011134203.GA1315@kfk4ever.com>
References: <20151011134203.GA1315@kfk4ever.com>
From: Jim Meyering <jim@meyering.net>
Date: Sun, 1 May 2016 18:27:03 -0700
X-Google-Sender-Auth: 1k2RbJmVg3gtEk1Su7XDzd6elDQ
Message-ID: <CA+8g5KFEe0+YrXJQtVH4Tb6YUr2JEWrPz_xbEj5aE6-Rqvp1mQ@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#21665: bug#21665: Use of mmap for large files
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 May 2016 01:28:24 -0000

tags 21665 notabug
close 21665
done

On Sun, Oct 11, 2015 at 6:42 AM, Maurice van der Pot
<griffon26@kfk4ever.com> wrote:
> I am working on an application suitable for visually merging large files.
> This application delegates determination of differences to GNU diff.
>
> Unfortunately I have found that diff reads the entire input files into
> memory, leading to "/usr/bin/diff: memory exhausted" messages on the
> types of files I'd like to support.
>
> Would you be open to patches that enable diffing large files by using
> mmap?

As Paul responded in http://bugs.gnu.org/21665#8, using mmap seems
unlikely to help much, but if you write the patch and demonstrate that
it does make a difference, we'll be very interested, and I will
happily reopen the issue.

For now, I'm marking this as notabug and closing it.




From MAILER-DAEMON Sun May 01 22:01:26 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ax3As-0005MT-RC
	for mharc-bug-diffutils@gnu.org; Sun, 01 May 2016 22:01:26 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38183)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ax3Ak-00059Q-Q7
	for bug-diffutils@gnu.org; Sun, 01 May 2016 22:01:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ax3AZ-0005cn-6h
	for bug-diffutils@gnu.org; Sun, 01 May 2016 22:01:13 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:48804)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ax3AY-0005b6-0K
	for bug-diffutils@gnu.org; Sun, 01 May 2016 22:01:07 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ax3AU-0003b5-EA
	for bug-diffutils@gnu.org; Sun, 01 May 2016 22:01:02 -0400
X-Loop: help-debbugs@gnu.org
References: <1787778417.63622490.1449488750054.JavaMail.zimbra@waag.org>
In-Reply-To: <1787778417.63622490.1449488750054.JavaMail.zimbra@waag.org>
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 02 May 2016 02:01:02 +0000
Resent-Message-ID: <handler.22108.B22108.146215443313783@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22108
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 22108@debbugs.gnu.org, taco@waag.org
Received: via spool by 22108-submit@debbugs.gnu.org id=B22108.146215443313783
	(code B ref 22108); Mon, 02 May 2016 02:01:02 +0000
Received: (at 22108) by debbugs.gnu.org; 2 May 2016 02:00:33 +0000
Received: from localhost ([127.0.0.1]:32908 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1ax3A0-0003aF-Vc
	for submit@debbugs.gnu.org; Sun, 01 May 2016 22:00:33 -0400
Received: from mail-oi0-f46.google.com ([209.85.218.46]:33796)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1ax39z-0003a2-M7
	for 22108@debbugs.gnu.org; Sun, 01 May 2016 22:00:31 -0400
Received: by mail-oi0-f46.google.com with SMTP id k142so175551083oib.1
	for <22108@debbugs.gnu.org>; Sun, 01 May 2016 19:00:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:from:date:message-id:subject:to;
	bh=bVAYSsL3EdSpq9eXQegBlXiB+9i5Xx8kjO+7OwgLaqQ=;
	b=lVfI1AofeIcGfUPRdEFsQeRlcyrMhLcZnA0qYpBP9pLfbs5o8j7fw7O517WBJv6+t+
	HCPYRa9WzWWohlG9L2HVpkDk8rumPq7MR6JlhlxoLSnHJ11uSL+9D0nzftEvjOSa24mV
	eOyxuGW+FucXdzWgiZ2fvZUCt5/TivnMo7tu4p1b3TQWE14NXm1wkguRv1+yJD3g+jKr
	ayz7NxpUFAx4PF3QgtQRKr0ifD10SY2j1ybLzN9Ool3GGREvAdYYbQD/B9gXjSx7PcWw
	oATG3ShnSgM6hMVee0yG5thKOON25NrBWclO8K2ZeW/eUOM9HxQLAo0SQ+TvEwbBnDuO
	aVDw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:from:date:message-id:subject
	:to; bh=bVAYSsL3EdSpq9eXQegBlXiB+9i5Xx8kjO+7OwgLaqQ=;
	b=f7zBlmDYV79OkBLYTXX5FBCHx/oAIUrB/5G1ekxvK0GsnaLflPLTE8Nouf6BmeWxe+
	W3Nva/C1vJfQdWWcB4Exx64W3gDM6gcYZRwa9qMKpDCDWwXiWgw17476v9lLaRXc051Q
	AFkA3Gjp+9Y+slz4r0+6zm1Y/ZfInwx98W1uDI9dqkxbfjiX/LYwcBnKTwX9ow5qDbNZ
	+DjcmaRNOYtTYuHciXnnajwdf4U9IAxFZOqChWHniqXt6tRW9qYmlayJ8/oLItfPT3Fh
	Lo70DwRjeu4SzVbkQC9k0f2C0o7zt9QejTTr1vBTNglF4etPHdLB/Znai+6baejPlg9X
	nszA==
X-Gm-Message-State: AOPr4FXEI/rv1RcEZh4wUJBnEkvc163CQnZt4d0uyATW+FoHlXKzMzx83htTineoQ3HUmEjcuJvZNbtuh6psdA==
X-Received: by 10.157.1.120 with SMTP id 111mr12975022otu.172.1462154426077;
	Sun, 01 May 2016 19:00:26 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.175.193 with HTTP; Sun, 1 May 2016 19:00:06 -0700 (PDT)
From: Jim Meyering <jim@meyering.net>
Date: Sun, 1 May 2016 19:00:06 -0700
X-Google-Sender-Auth: _tb1AnzEmaOMpTRba9IwMK47lIc
Message-ID: <CA+8g5KGN0e8npXT7nJDWMJmy_kYYoOKKYcFawDTNgQ7xiBCrdg@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22108: diff wrapper script for very large files,
 low memory
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 May 2016 02:01:25 -0000

tags 22108 wishlist
done

Thanks for the suggestion and pointer.
FYI, your problem is very similar to that described at http://bugs.gnu.org/21665

I'm marking this auto-created issue as "wishlist".
A combination of this approach and using mmap may be profitable when
input files are too large for available RAM.




From MAILER-DAEMON Mon May 09 00:17:09 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1azcd3-0006pa-5Y
	for mharc-bug-diffutils@gnu.org; Mon, 09 May 2016 00:17:09 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51967)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1azcd1-0006lH-0I
	for bug-diffutils@gnu.org; Mon, 09 May 2016 00:17:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1azccw-0006ji-NE
	for bug-diffutils@gnu.org; Mon, 09 May 2016 00:17:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:59575)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1azccw-0006jS-JE
	for bug-diffutils@gnu.org; Mon, 09 May 2016 00:17:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1azccw-0001rw-6G
	for bug-diffutils@gnu.org; Mon, 09 May 2016 00:17:02 -0400
References: <20151226180748.GA29426@cantor.unex.es>
In-Reply-To: <20151226180748.GA29426@cantor.unex.es>
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-To: bug-diffutils@gnu.org
Resent-Date: Mon, 09 May 2016 04:17:01 +0000
Resent-Message-ID: <handler.22245.D22245.14627674177164.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 22245
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 22245-done@debbugs.gnu.org
Mail-Followup-To: 22245@debbugs.gnu.org, jim@meyering.net, sanvila@unex.es
Received: via spool by 22245-done@debbugs.gnu.org id=D22245.14627674177164
	(code D ref 22245); Mon, 09 May 2016 04:17:01 +0000
Received: (at 22245-done) by debbugs.gnu.org; 9 May 2016 04:16:57 +0000
Received: from localhost ([127.0.0.1]:43679 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1azccr-0001rT-9x
	for submit@debbugs.gnu.org; Mon, 09 May 2016 00:16:57 -0400
Received: from mail-oi0-f46.google.com ([209.85.218.46]:33163)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1azcco-0001rG-L3
	for 22245-done@debbugs.gnu.org; Mon, 09 May 2016 00:16:55 -0400
Received: by mail-oi0-f46.google.com with SMTP id v145so197231207oie.0
	for <22245-done@debbugs.gnu.org>; Sun, 08 May 2016 21:16:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:from:date:message-id:subject:to;
	bh=JmzwpAh261ycC4sT+P1KHX03TAOIM8TM48ctGLZpdQM=;
	b=GzzUgbe//JbasdCO1wPwxSAUXDhrAx65DDIRgtAHn932rRGcNTmmMgqiKfabQSMQdV
	uVrOUibAayao2cYNU/IDSo61jto6pA9qSB7NbIPvKRkXFXhHmS4rsFUjW3GJqTqI/NiV
	uhmmWRMyxWz+C669v/Nq3BdiwLE1xl8l3b29Vbp7O1e32cSX9gsHHJ4UKLb9VqLHolG6
	wA/zyF6+qCMlT9mYfpnunWG0e7UpfamyU/2/3O7x1Pj/oRyAek9VexYdaBAW5QhYcjRI
	LA0BYc585JaXiNyf/cJ7saBMdIJgSlb4fMX7iCv6D4uphykEeL8V54AQOfytGt1x835S
	FU7w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:from:date:message-id:subject
	:to; bh=JmzwpAh261ycC4sT+P1KHX03TAOIM8TM48ctGLZpdQM=;
	b=UiNj5WKiS+/x21wzuaOaj0lsEofiogiSkM/tl7XgrFtND46U3qIYW/Xv7FJaUGzcpu
	pL4zIcZTHQtk875qCIyKnIXUgXfsbfsimqNbFOWcqZo8PcLBtlQYkNVhgZ/abJ2KhP66
	nPQnQFbwCraBjLXTH5Bm1tJHbiyKgMfTXV1WGiL7g+orsyAy8ouMOjsrwKfilsOjJvNw
	u498VisYq3PR+07fdKwKrF0ppjSfS6n4GAOoT2VCpo8CMZ5/kdKCPfOEgAoG963ux33S
	Vg+4bVlEQPFrbSgCcbMJgFfOmkskExRJ0fRigobpmZkY13mdJZHlcYrcP/AQ/3LBw/vB
	wMeA==
X-Gm-Message-State: AOPr4FXdebghUkjLPJfwusKTIeWWri+8GChIks7bokKM1X1jk6hulKx5d81xw12VDTeMCdaXSNPp2QVNSGJ1IA==
X-Received: by 10.157.62.181 with SMTP id b50mr13499289otc.163.1462767408635; 
	Sun, 08 May 2016 21:16:48 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.175.193 with HTTP; Sun, 8 May 2016 21:16:28 -0700 (PDT)
From: Jim Meyering <jim@meyering.net>
Date: Sun, 8 May 2016 21:16:28 -0700
X-Google-Sender-Auth: l9kLAXBAQPpX6RnVu-Oyv7qj8gg
Message-ID: <CA+8g5KE8JUQEWbY7yzX6ez=FC9iddXyd_fdamnO4nau8b-5pKg@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22245: diffutils: FTBFS: FAIL:
 test-update-copyright.sh
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 May 2016 04:17:08 -0000

Thanks for the report.
This has been fixed in preparation for the upcoming release, so closing.




From MAILER-DAEMON Mon May 09 00:37:09 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1azcwP-00049z-U1
	for mharc-bug-diffutils@gnu.org; Mon, 09 May 2016 00:37:09 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53843)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1azcwM-00045D-Vc
	for bug-diffutils@gnu.org; Mon, 09 May 2016 00:37:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1azcwI-0001S5-Ja
	for bug-diffutils@gnu.org; Mon, 09 May 2016 00:37:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:59582)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1azcwI-0001Rs-F9
	for bug-diffutils@gnu.org; Mon, 09 May 2016 00:37:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1azcwI-0002ML-6j
	for bug-diffutils@gnu.org; Mon, 09 May 2016 00:37:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 09 May 2016 04:37:02 +0000
Resent-Message-ID: <handler.20250.B20250.14627686039042@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 20250
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Andreas <wiisses@web.de>
Cc: 20250@debbugs.gnu.org
Received: via spool by 20250-submit@debbugs.gnu.org id=B20250.14627686039042
	(code B ref 20250); Mon, 09 May 2016 04:37:02 +0000
Received: (at 20250) by debbugs.gnu.org; 9 May 2016 04:36:43 +0000
Received: from localhost ([127.0.0.1]:43686 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1azcvz-0002Lj-2c
	for submit@debbugs.gnu.org; Mon, 09 May 2016 00:36:43 -0400
Received: from mail-oi0-f67.google.com ([209.85.218.67]:33732)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1azcvx-0002LW-2W
	for 20250@debbugs.gnu.org; Mon, 09 May 2016 00:36:41 -0400
Received: by mail-oi0-f67.google.com with SMTP id f63so25714992oig.0
	for <20250@debbugs.gnu.org>; Sun, 08 May 2016 21:36:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc;
	bh=mYla1f0vay0HsRIExSib9FBwIWbCmDLT10trBgSsK7g=;
	b=A4tAdG+DEIf9FfMz0RplE9B+qGaD2iiYjddW9UtngO1KqYYyU06rQlwwDGiHfObLpu
	pTrJf9T5lXdOHjc/0uu9xRlC5H28tHcuv4FYWnG2tf+d87ubPk16gFONQyjcJrvKTFfB
	W35kd6avAUngwFmFFEOz6lgBGQzRAoWnbJo1nuBAr43ze/fkQUi3z0V1LAFrMRHctqr9
	6ikrRHLdDuTIk4mLHDepiIUlsaCaaDKg0o1HoRW5ijifJSqWBF8pcOALsQoaZOya16DG
	03z5D8hUCTrJGdx11xWVIFPGT+sgrUKh3fSHPAuWttEdz70zv1A+Bu1LBsUioURIhAGX
	eBrg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc;
	bh=mYla1f0vay0HsRIExSib9FBwIWbCmDLT10trBgSsK7g=;
	b=b8wgkWhuSYSQIBKszz0I0qGFa97G21RQSjs+W/G8UGx8h5t9JajqqUzkMbWfkdpBAF
	ZNIYWAbpQQwHe22hJrsppf74wsUKEBH4qh3ZW9jmA9aSHC6NlIBVmByLyoIwxUf2eX/6
	Mzq1JfcBeJC/egwbMJZkjXNfCM5smIhK7ZxymT0p7y2QLKUz/oolohT8l2ji62pyh1GM
	GlfMt0PUpGYd6560VCU3Gr9HBYEND86pY01H7SWQ9LnXheX1BzBVexE0QWkyInzR/hIZ
	LN9QE/Tiq6LisF9njPMWDX2yVOIkIgA5smAp7AXwia+wVcohxR/a6mXE/55k6li+r0Nu
	iiJw==
X-Gm-Message-State: AOPr4FVTiS4U8kXx99HZUoczZ+H5HNsekOhuZgPjz2IHB4R1tX6BcNlHg3gPwVhB3SAFIusVQEjcgzMmnMwUcA==
X-Received: by 10.157.1.120 with SMTP id 111mr13496892otu.172.1462768595388;
	Sun, 08 May 2016 21:36:35 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.175.193 with HTTP; Sun, 8 May 2016 21:36:15 -0700 (PDT)
In-Reply-To: <551E93A8.6020603@web.de>
References: <551E93A8.6020603@web.de>
From: Jim Meyering <jim@meyering.net>
Date: Sun, 8 May 2016 21:36:15 -0700
X-Google-Sender-Auth: t5-bpn1inVf7yO721_1Ii1pQ7e4
Message-ID: <CA+8g5KFHv5MKqiCsoH=cH66mQpz1=0AC3-Z67ps7wG1zO1rWGw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#20250:  bug#20250: diff by size
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 May 2016 04:37:08 -0000

tags 20250 notabug
close 20250
done

On Fri, Apr 3, 2015 at 6:20 AM, Andreas <wiisses@web.de> wrote:
> Dear diff-team,
>
> this is not a bug but an idea for a diff option in further versions:
>
> Idea:
> comparison of two files by size only.
>
> why?
> makes comparison extremely fast; often no need to compare file contents
> to get a first hint whether there is a difference at all
>
> example:
> - uploading a folder with a bunch of files to a slow motion cloud;
> comparing each file by contents is very time consuming (...slow motion
> cloud)
> - as a first hint to find out about a possible difference could be the
> comparison of file size for each file uploaded with the local ones

Thanks for the suggestion, but diff already performs the optimization,
when possible, of detecting when two files have different sizes,
and in that case does not even bother to open
(much less read/compare) them.

If you want to simply compare file sizes, you can already
write a tiny shell/perl/python script to obtain and compare
those numbers, so I'm closing this auto-created "issue".
You're welcome to continue the discussion, which is being
archived at http://bugs.gnu.org/20250




From MAILER-DAEMON Mon May 09 11:40:12 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aznI4-00029s-Bq
	for mharc-bug-diffutils@gnu.org; Mon, 09 May 2016 11:40:12 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60415)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aznI1-00024j-L6
	for bug-diffutils@gnu.org; Mon, 09 May 2016 11:40:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aznHu-0000V2-9M
	for bug-diffutils@gnu.org; Mon, 09 May 2016 11:40:08 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:60414)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aznHu-0000Uv-5t
	for bug-diffutils@gnu.org; Mon, 09 May 2016 11:40:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aznHt-00051E-RB
	for bug-diffutils@gnu.org; Mon, 09 May 2016 11:40:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 09 May 2016 15:40:01 +0000
Resent-Message-ID: <handler.20250.B20250.146280837919259@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 20250
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Andreas <wiisses@web.de>
Cc: 20250@debbugs.gnu.org
Received: via spool by 20250-submit@debbugs.gnu.org id=B20250.146280837919259
	(code B ref 20250); Mon, 09 May 2016 15:40:01 +0000
Received: (at 20250) by debbugs.gnu.org; 9 May 2016 15:39:39 +0000
Received: from localhost ([127.0.0.1]:44518 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aznHX-00050Z-0x
	for submit@debbugs.gnu.org; Mon, 09 May 2016 11:39:39 -0400
Received: from mail-oi0-f47.google.com ([209.85.218.47]:32769)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1aznHU-00050I-Lg
	for 20250@debbugs.gnu.org; Mon, 09 May 2016 11:39:37 -0400
Received: by mail-oi0-f47.google.com with SMTP id v145so214336315oie.0
	for <20250@debbugs.gnu.org>; Mon, 09 May 2016 08:39:36 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc;
	bh=4uPsKaCHW3A31MT6s9g8Caa0Un7QEyDh5DoRT0+i+uo=;
	b=jDBZBGpONYQi+BgZ49a+Hkn0FQm7xvRPZwc3dfZWoetBSL+V3Q4jmJtmhZYTHeR9Ux
	Ct7XGDzM66JN8F2IDTZy4zr2RXRh2AVrXSfRuNltNB6fjTzNJl4WgCQY8/+wyPFp77Ud
	hJQoItwEICm/Df4vL8qgK969L6kH2ji64jWo7FZuMzQxDiHL7YMNuO3MGzThGX7v9HIq
	oIlNi2BhAllIo8a+xnFTrSdrOOo+UuuoT5xvNsyhZvr6VhoSM27jZ7yFhiMLrNAWrDkY
	d5zJ6xYskeAYd9FJjkhTel6Y+FSwLXR0sWtozQq0TXs7MornDUpCa2dCnxMv1VtPJDcv
	gfGw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc;
	bh=4uPsKaCHW3A31MT6s9g8Caa0Un7QEyDh5DoRT0+i+uo=;
	b=GRtS45BjGcFcmFC89WEbO7EuK8VpeWcZFYmpLZGYSZG590UOlPE2IXGZ9R1ZhD3Xtu
	HNnfu1IQRp9OAVH6An74PX0tEdT2F2GyQjCpCRzIXtMkqT67hxJdeOzQ8CmureGPs9d7
	eSZtqFuEth2vKFKsnUBx0gNA4s10pxb/3T24leSMac1lh1cu3kXC66aPgZTNy9ZVyVM6
	oiA7WeunuLnu3xUbajEo3ThERYcNSR2Ji3iE4aFwYTZH5RBCVfSxhpULVGmVucla74PR
	UXYteWh4te954aZRbct70gvjHvocwo36dbGdpmASwXx8boZ3Fl0ifO1YdV6akPdi5/WE
	0U7Q==
X-Gm-Message-State: AOPr4FWsHFeYtGKwuQZ3lZuz3x8wl5arq+XhQ8BXDc+Wgpc/NpSIEvk67b+1VAUEkpvPjFoy7DtebLZxj6n9bw==
X-Received: by 10.157.1.120 with SMTP id 111mr465425otu.172.1462808370909;
	Mon, 09 May 2016 08:39:30 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.175.193 with HTTP; Mon, 9 May 2016 08:39:10 -0700 (PDT)
In-Reply-To: <CA+8g5KFHv5MKqiCsoH=cH66mQpz1=0AC3-Z67ps7wG1zO1rWGw@mail.gmail.com>
References: <551E93A8.6020603@web.de>
	<CA+8g5KFHv5MKqiCsoH=cH66mQpz1=0AC3-Z67ps7wG1zO1rWGw@mail.gmail.com>
From: Jim Meyering <jim@meyering.net>
Date: Mon, 9 May 2016 08:39:10 -0700
X-Google-Sender-Auth: GTpw5UctMbYnv9yyeH_0C3kPDjo
Message-ID: <CA+8g5KGgk2KkmQ8Jzyoow3nE4m6FE6VgQgzcAL0Zi0gq=dEjLQ@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#20250:  bug#20250: diff by size
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 May 2016 15:40:10 -0000

On Sun, May 8, 2016 at 9:36 PM, Jim Meyering <jim@meyering.net> wrote:
> tags 20250 notabug
> close 20250
> done
>
> On Fri, Apr 3, 2015 at 6:20 AM, Andreas <wiisses@web.de> wrote:
>> Dear diff-team,
>>
>> this is not a bug but an idea for a diff option in further versions:
>>
>> Idea:
>> comparison of two files by size only.
>>
>> why?
>> makes comparison extremely fast; often no need to compare file contents
>> to get a first hint whether there is a difference at all
>>
>> example:
>> - uploading a folder with a bunch of files to a slow motion cloud;
>> comparing each file by contents is very time consuming (...slow motion
>> cloud)
>> - as a first hint to find out about a possible difference could be the
>> comparison of file size for each file uploaded with the local ones
>
> Thanks for the suggestion, but diff already performs the optimization,
> when possible, of detecting when two files have different sizes,
> and in that case does not even bother to open
> (much less read/compare) them.

To clarify: the above is what happens when you use the --brief (-q) option.
It is obviously not the default.




From MAILER-DAEMON Mon May 16 00:24:11 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b2A4h-0003tt-Oq
	for mharc-bug-diffutils@gnu.org; Mon, 16 May 2016 00:24:11 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54298)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2A4e-0003oX-LP
	for bug-diffutils@gnu.org; Mon, 16 May 2016 00:24:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2A4Y-0000K4-Jq
	for bug-diffutils@gnu.org; Mon, 16 May 2016 00:24:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:40828)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2A4Y-0000K0-Gd
	for bug-diffutils@gnu.org; Mon, 16 May 2016 00:24:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2A4Y-0002zA-AW
	for bug-diffutils@gnu.org; Mon, 16 May 2016 00:24:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 16 May 2016 04:24:02 +0000
Resent-Message-ID: <handler.21715.B21715.146337259011410@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 21715
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Aaron Davies <aaron.davies@gmail.com>
Cc: 21715@debbugs.gnu.org
Received: via spool by 21715-submit@debbugs.gnu.org id=B21715.146337259011410
	(code B ref 21715); Mon, 16 May 2016 04:24:02 +0000
Received: (at 21715) by debbugs.gnu.org; 16 May 2016 04:23:10 +0000
Received: from localhost ([127.0.0.1]:53165 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b2A3i-0002xy-9R
	for submit@debbugs.gnu.org; Mon, 16 May 2016 00:23:10 -0400
Received: from mail-oi0-f65.google.com ([209.85.218.65]:34676)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1b2A3g-0002xm-8w
	for 21715@debbugs.gnu.org; Mon, 16 May 2016 00:23:08 -0400
Received: by mail-oi0-f65.google.com with SMTP id d139so27078556oig.1
	for <21715@debbugs.gnu.org>; Sun, 15 May 2016 21:23:08 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc:content-transfer-encoding;
	bh=GdqmARgEMO2DQrJoS2VBT6z20PzYXtUC8KhxW8k3138=;
	b=sqxDgXbPIFwIQKDIGM3a/r2bOEkV4RpK49CinJmMMp2GK/0taRupybXR9VYmn4KefQ
	7DjOe8WFKWOEjq2wrWtfX2IvZ64JKmgNtCNsbONfWmcqKroDnM5aDB34kE3SrP1q4Ub9
	9QhctLGdjm7CjHA0kTuu85bLFMD6fA2xyNBKW1DVkpdpbvV9FipXHxMBC8K3ITLon0BG
	0i04imHAeYm+NkvXy3iMGoMw0avOCWL7mwseurOHXXdkyr1n102mW/h2ETFTNA8hLFir
	rvtUZ03NTZQzwACBTiaJGahcYFXaG2/F2NYl5jzBU8eOOAH76L2GhsvO+953JXObkDkl
	HWXw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc:content-transfer-encoding;
	bh=GdqmARgEMO2DQrJoS2VBT6z20PzYXtUC8KhxW8k3138=;
	b=PvhQCI1YPuXcB4Iq6kwQOjQQ0/WNkmUzoeuQEC64isEP5djShpEEEyT24wefBC4VUO
	vg1edJrGm/xDyFyneKRYLL02WAHRRMA0gbVtK/FIjpvRGN7yF59OYKd7YpDOcT20iJzw
	gYAJkNYaPvQE7nfJQzWqADDdF+xBLIMLVzdo93Pgu3VXnl4IO59Vtkm2hRdnSQ/zT4rr
	0tJZ/wMBQTVaygZdHpW69RqETWHPW3/yaKYa44dZ7V9Uwumlse48CM4+B9VpJFhBJyEA
	JHXAarvs/UPDuK3QK2e8OztyutRwctGOjgZJi4fzLc4Pp3L0Lf5i+/jywO+Shgy2PJdD
	5QIw==
X-Gm-Message-State: AOPr4FWPzcnt6ODsVBczdG2htfO8HLxi5lzSETcg5PKnl8I5xo00XPQSZC+CFs/7GlBjl7QejY4ZHoYW9zMRcw==
X-Received: by 10.157.11.183 with SMTP id 52mr14563282oth.103.1463372582615;
	Sun, 15 May 2016 21:23:02 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.175.193 with HTTP; Sun, 15 May 2016 21:22:42 -0700 (PDT)
In-Reply-To: <18A193A3-1591-4696-B8D1-5B86ED291450@gmail.com>
References: <18A193A3-1591-4696-B8D1-5B86ED291450@gmail.com>
From: Jim Meyering <jim@meyering.net>
Date: Sun, 15 May 2016 21:22:42 -0700
X-Google-Sender-Auth: aYQOi_N62Gcq35twY7oPTze68Qg
Message-ID: <CA+8g5KEJyZX6Qx16a6j248v0OJo0nu_re5K-ev11kU+_=39Ecw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#21715: bug#21715: feat req: an option to skip
 directory inode comparison
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 May 2016 04:24:10 -0000

On Mon, Oct 19, 2015 at 7:27 PM, Aaron Davies <aaron.davies@gmail.com> wrot=
e:
> i have a situation where diff -r of two directories fails to report diffe=
rences that diff of two files in those directories shows
>
> i haven't dug into the code yet, but the directories involved are on an N=
FS mount of a netapp filer, one is the copy-on-write snapshot counterpart o=
f the other, they show up as the same filesystem, and are the same inode
>
> so my guess is that there's something in the recursive traversal that say=
s that any two directories that are on the same fs and are the same inode m=
ust have identical descendent contents and can be skipped completely
>
> this fs probably violates POSIX by doing this, but there's no easy way ar=
ound it[1], so it would be very useful if diff had a command-line option to=
 turn that optimization off
>
> i've heard anecdotal reports of other filesystems that cause the same pro=
blem
>
> here's a sample session:
>
> $ mkdir foo
> $ echo baz >foo/bar
> $ # wait until the next snapshot is created
> $ echo quux >foo/bar
> $ diff -r .snapshot/nightly.0/foo foo
> $ diff .snapshot/nightly.0/foo/bar foo/bar
> 1c1
> < baz
> ---
>> quux
> $ stat -c %i .snapshot/nightly.0/foo foo
> 69403847
> 69403847
> $
> --
> Aaron Davies
> aaron.davies@gmail.com
>
> [1] when i ran into this, i ended up using something like diff <(find .sn=
apshot/nightly.0/foo -type f|sort|xargs cat) <(find foo -type f|sort|xargs =
cat) to do the comparison -- sufficient for my needs at the time, but clean=
ing it up for general purpose use would essentially be rewriting the -r par=
t of diff from scratch

Hi Aaron,
Thanks for the suggestion, but what NetApp software are you using?
I've just tried to reproduce that on a NetApp-backed nfs-mounted directory,
and see different inode numbers for the directories:

  $ stat --format %i foo .snapshot/hourly.2016-05-15_*/foo
  97582543
  97557711




From MAILER-DAEMON Mon May 16 02:14:10 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b2Bn8-0001OM-Dg
	for mharc-bug-diffutils@gnu.org; Mon, 16 May 2016 02:14:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34835)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2Bn6-0001JT-2M
	for bug-diffutils@gnu.org; Mon, 16 May 2016 02:14:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2Bn0-0007Mj-0D
	for bug-diffutils@gnu.org; Mon, 16 May 2016 02:14:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:40845)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2Bmz-0007Mf-TN
	for bug-diffutils@gnu.org; Mon, 16 May 2016 02:14:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2Bmz-0005cQ-PM
	for bug-diffutils@gnu.org; Mon, 16 May 2016 02:14:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Paul Eggert <eggert@cs.ucla.edu>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 16 May 2016 06:14:01 +0000
Resent-Message-ID: <handler.21715.B21715.146337919321529@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 21715
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Jim Meyering <jim@meyering.net>, Aaron Davies <aaron.davies@gmail.com>
Cc: 21715@debbugs.gnu.org
Received: via spool by 21715-submit@debbugs.gnu.org id=B21715.146337919321529
	(code B ref 21715); Mon, 16 May 2016 06:14:01 +0000
Received: (at 21715) by debbugs.gnu.org; 16 May 2016 06:13:13 +0000
Received: from localhost ([127.0.0.1]:53182 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b2BmC-0005bA-QX
	for submit@debbugs.gnu.org; Mon, 16 May 2016 02:13:12 -0400
Received: from zimbra.cs.ucla.edu ([131.179.128.68]:42636)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <eggert@cs.ucla.edu>) id 1b2BmA-0005as-9d
	for 21715@debbugs.gnu.org; Mon, 16 May 2016 02:13:10 -0400
Received: from localhost (localhost [127.0.0.1])
	by zimbra.cs.ucla.edu (Postfix) with ESMTP id 576281612D8;
	Sun, 15 May 2016 23:13:04 -0700 (PDT)
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
	by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032)
	with ESMTP id rBlkFO76fwgC; Sun, 15 May 2016 23:13:03 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
	by zimbra.cs.ucla.edu (Postfix) with ESMTP id A59D71612DD;
	Sun, 15 May 2016 23:13:03 -0700 (PDT)
X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
	by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id Xcj_0S7eSRb3; Sun, 15 May 2016 23:13:03 -0700 (PDT)
Received: from [192.168.1.9] (unknown [100.32.155.148])
	by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 86B191612D8;
	Sun, 15 May 2016 23:13:03 -0700 (PDT)
References: <18A193A3-1591-4696-B8D1-5B86ED291450@gmail.com>
	<CA+8g5KEJyZX6Qx16a6j248v0OJo0nu_re5K-ev11kU+_=39Ecw@mail.gmail.com>
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
Message-ID: <573964EF.8000801@cs.ucla.edu>
Date: Sun, 15 May 2016 23:13:03 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
	Thunderbird/38.7.2
MIME-Version: 1.0
In-Reply-To: <CA+8g5KEJyZX6Qx16a6j248v0OJo0nu_re5K-ev11kU+_=39Ecw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#21715: bug#21715: bug#21715: feat req: an
 option to skip directory inode comparison
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 May 2016 06:14:09 -0000

Jim Meyering wrote:
> Thanks for the suggestion, but what NetApp software are you using?
> I've just tried to reproduce that on a NetApp-backed nfs-mounted direct=
ory,
> and see different inode numbers for the directories:
>=20
>   $ stat --format %i foo .snapshot/hourly.2016-05-15_*/foo
>   97582543
>   97557711

I can reproduce the problem on my platform: a RHEL 7 client
(3.10.0-327.10.1.el7.x86_64 kernel), with a NetApp server running a fairl=
y old
release. The last time I asked (in 2010), they were running netapp-6.5.6 =
on the
file server.

As far as I know, only NetApp has the inode-number bug. It's had the bug =
for
many years, and I'm a bit surprised to see that they fixed it in a recent=
 release.




From MAILER-DAEMON Mon May 16 15:29:10 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b2OCU-00078g-Jm
	for mharc-bug-diffutils@gnu.org; Mon, 16 May 2016 15:29:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49588)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2OCS-00071Q-CB
	for bug-diffutils@gnu.org; Mon, 16 May 2016 15:29:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2OCM-0005ID-AK
	for bug-diffutils@gnu.org; Mon, 16 May 2016 15:29:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:42066)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2OCM-0005Hw-71
	for bug-diffutils@gnu.org; Mon, 16 May 2016 15:29:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b2OCL-0000Jz-UA
	for bug-diffutils@gnu.org; Mon, 16 May 2016 15:29:01 -0400
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-To: bug-diffutils@gnu.org
Resent-Date: Mon, 16 May 2016 19:29:01 +0000
Resent-Message-ID: <handler.21715.D21715.14634269261205.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 21715
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: Aaron Davies <aaron.davies@gmail.com>, 21715-done@debbugs.gnu.org
Mail-Followup-To: 21715@debbugs.gnu.org, jim@meyering.net,
	aaron.davies@gmail.com
Received: via spool by 21715-done@debbugs.gnu.org id=D21715.14634269261205
	(code D ref 21715); Mon, 16 May 2016 19:29:01 +0000
Received: (at 21715-done) by debbugs.gnu.org; 16 May 2016 19:28:46 +0000
Received: from localhost ([127.0.0.1]:54403 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b2OC5-0000JN-M1
	for submit@debbugs.gnu.org; Mon, 16 May 2016 15:28:45 -0400
Received: from mail-ob0-f196.google.com ([209.85.214.196]:34910)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1b2OC4-0000JB-Fk
	for 21715-done@debbugs.gnu.org; Mon, 16 May 2016 15:28:45 -0400
Received: by mail-ob0-f196.google.com with SMTP id o7so2703549obl.2
	for <21715-done@debbugs.gnu.org>; Mon, 16 May 2016 12:28:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc;
	bh=sbGMadwxPBBivEFdqJdWtzH3xf1fKTJcu6LsdCeTZkE=;
	b=VQdC7vaPeBdkwJtKK3ar2vIEgA1DvcGCrEjbBF2wC/AZGOpxhPmxr9+2X2+dqIrJtU
	xA1V5WeOsKLWRzdKAPa5yDnwqcBUDYXvDK4zOrIJpZjCJGegBAS6T9lKk4VNE1CCTagY
	URko51HQBht0Nvzw6/aK0qdyxSWP++N84K3dhG7cdfFP+bscvTH4YhABgllkZKlFuex3
	fogj40baVCFRRt48SSWEQVH/5f5Cn/SWQB5+A0ZHpJe6paemy8LPcfCNYjTKK2APck2j
	avwGGYwik48eLF8/ddAWHK1alNnLKx0M7qh5Ac25MlWaVCfkh+XTN7Z2vM4SCQx7sEI+
	TZtQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc;
	bh=sbGMadwxPBBivEFdqJdWtzH3xf1fKTJcu6LsdCeTZkE=;
	b=WVDQXu+gFc60SCLjt+ylBRxc2fB+FZ6DSVLd61KyunFVKhBGiv1+14xIslUtfRqMwI
	YD0AOo1lTBV0uAkaQKqOP1IBpKtOu08RMgZYZgNXctIKBY57X38X+5jzZOCewcmYDF+J
	dGauArJzEnPtO63ICLd+7facvJBid+OLtEEty6QHtvWHPGYMphyzKecNDKmioPgeDMYm
	rhY0MD/+txi8YqkLVQZpsHwrCX6XtkWIaw953+qchBbvrZ/NJaUSxxNeLRP4STHUFKkr
	VNiOp1G/4m6e+oQ2U8pEKLK9CpRHQUek6S7UUqhxRQMvHDxsPnY8Xnj3dVmHOoynTmsV
	ry4A==
X-Gm-Message-State: AOPr4FVqtnEj7/mXrpIhzqrS7kr9jNbODWHiYmjWogzUaS+QbzmcYN20QjtutjwriH67aT7y+WmFveBEa0FE8A==
X-Received: by 10.157.48.89 with SMTP id w25mr1159714otd.32.1463426918643;
	Mon, 16 May 2016 12:28:38 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.175.193 with HTTP; Mon, 16 May 2016 12:28:18 -0700 (PDT)
In-Reply-To: <573964EF.8000801@cs.ucla.edu>
References: <18A193A3-1591-4696-B8D1-5B86ED291450@gmail.com>
	<CA+8g5KEJyZX6Qx16a6j248v0OJo0nu_re5K-ev11kU+_=39Ecw@mail.gmail.com>
	<573964EF.8000801@cs.ucla.edu>
From: Jim Meyering <jim@meyering.net>
Date: Mon, 16 May 2016 12:28:18 -0700
X-Google-Sender-Auth: gd8z-D285Zjch1Q-2j0j0WuedEw
Message-ID: <CA+8g5KF=7qt+F1yq5j2iJWryy6CQkf13vbEyhZ8sbSVu_M3cGA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#21715: bug#21715: bug#21715: feat req: an
 option to skip directory inode comparison
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 May 2016 19:29:09 -0000

On Sun, May 15, 2016 at 11:13 PM, Paul Eggert <eggert@cs.ucla.edu> wrote:
> Jim Meyering wrote:
>> Thanks for the suggestion, but what NetApp software are you using?
>> I've just tried to reproduce that on a NetApp-backed nfs-mounted directory,
>> and see different inode numbers for the directories:
>>
>>   $ stat --format %i foo .snapshot/hourly.2016-05-15_*/foo
>>   97582543
>>   97557711
>
> I can reproduce the problem on my platform: a RHEL 7 client
> (3.10.0-327.10.1.el7.x86_64 kernel), with a NetApp server running a fairly old
> release. The last time I asked (in 2010), they were running netapp-6.5.6 on the
> file server.
>
> As far as I know, only NetApp has the inode-number bug. It's had the bug for
> many years, and I'm a bit surprised to see that they fixed it in a recent release.

I confess I was surprised, too, after so many years.
Running `version` on the server my client used prints this:

  NetApp Release 8.3.1P2: Wed Dec 09 03:10:24 UTC 2015

As such, it feels ok to close this.




From MAILER-DAEMON Sat May 21 13:39:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b4Ark-0007nV-1d
	for mharc-bug-diffutils@gnu.org; Sat, 21 May 2016 13:39:08 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47855)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b4Arh-0007nE-DJ
	for bug-diffutils@gnu.org; Sat, 21 May 2016 13:39:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b4Are-0006RQ-OL
	for bug-diffutils@gnu.org; Sat, 21 May 2016 13:39:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:47788)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b4Are-0006RG-Kt
	for bug-diffutils@gnu.org; Sat, 21 May 2016 13:39:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b4Are-0008DQ-8g
	for bug-diffutils@gnu.org; Sat, 21 May 2016 13:39:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: <daveparrish@tutanota.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sat, 21 May 2016 17:39:02 +0000
Resent-Message-ID: <handler.23596.B.146385229531526@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 23596
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 23596@debbugs.gnu.org
X-Debbugs-Original-To: <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.146385229531526
	(code B ref -1); Sat, 21 May 2016 17:39:02 +0000
Received: (at submit) by debbugs.gnu.org; 21 May 2016 17:38:15 +0000
Received: from localhost ([127.0.0.1]:60125 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b4Aqs-0008CN-T7
	for submit@debbugs.gnu.org; Sat, 21 May 2016 13:38:15 -0400
Received: from eggs.gnu.org ([208.118.235.92]:51743)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <daveparrish@tutanota.com>) id 1b47od-0003ph-Cl
	for submit@debbugs.gnu.org; Sat, 21 May 2016 10:23:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <daveparrish@tutanota.com>) id 1b47oT-0006f3-Fc
	for submit@debbugs.gnu.org; Sat, 21 May 2016 10:23:38 -0400
Received: from lists.gnu.org ([2001:4830:134:3::11]:50752)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <daveparrish@tutanota.com>) id 1b47oT-0006ek-CB
	for submit@debbugs.gnu.org; Sat, 21 May 2016 10:23:33 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42675)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <daveparrish@tutanota.com>) id 1b47oN-0001hT-JT
	for bug-diffutils@gnu.org; Sat, 21 May 2016 10:23:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <daveparrish@tutanota.com>) id 1b47oI-0006cm-Ur
	for bug-diffutils@gnu.org; Sat, 21 May 2016 10:23:27 -0400
Received: from w1.tutanota.de ([81.3.6.162]:60436)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <daveparrish@tutanota.com>) id 1b47oI-0006cE-JQ
	for bug-diffutils@gnu.org; Sat, 21 May 2016 10:23:22 -0400
Received: from localhost (unknown [127.0.0.1])
	by w1.tutanota.de (Postfix) with ESMTP id 4CE0EFA8505
	for <bug-diffutils@gnu.org>; Sat, 21 May 2016 14:23:20 +0000 (UTC)
Received: from w1.tutanota.de ([127.0.0.1])
	by localhost (w1.tutanota.de [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id He_Df0V7c0Ni for <bug-diffutils@gnu.org>;
	Sat, 21 May 2016 14:23:14 +0000 (UTC)
Received: from w1.tutanota.de (unknown [127.0.0.1])
	by w1.tutanota.de (Postfix) with ESMTP id 1C529FA8501
	for <bug-diffutils@gnu.org>; Sat, 21 May 2016 14:23:14 +0000 (UTC)
Date: Sat, 21 May 2016 15:23:14 +0100 (BST)
From: <daveparrish@tutanota.com>
Message-ID: <KIIghJI--3-0@tutanota.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_7698_1890366927.1463840594101"
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Mailman-Approved-At: Sat, 21 May 2016 13:38:14 -0400
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#23596: Add exclude directories feature
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 21 May 2016 17:39:06 -0000

------=_Part_7698_1890366927.1463840594101
Content-Type: multipart/alternative; 
	boundary="----=_Part_7699_495174991.1463840594101"

------=_Part_7699_495174991.1463840594101
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Hello,
I would like to add a feature to the diff utility. The feature would allow 
exclude patterns to match directories as well as base filenames so entire 
directories can easily be ignored.
The feature adds the option `--exclude-directory` which is intended to be 
used with `--exclude=PAT` or `--exclude-from=FILE`.
I've attached a patch file which adds this feature along with a couple of 
tests and documentation.
Is this something that can be added to diff?
David
--
Securely sent with Tutanota. Claim your encrypted mailbox today!
https://tutanota.com
------=_Part_7699_495174991.1463840594101
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 7bit

<html>
  <head>
    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
  </head>
  <body>
Hello,<div><br /></div><div>I would like to add a feature to the diff utility. The feature would allow exclude patterns to match directories as well as base filenames so entire directories can easily be ignored.</div><div><br /></div><div>The feature adds the option `--exclude-directory` which is intended to be used with `--exclude=PAT` or `--exclude-from=FILE`.</div><div><br /></div><div>I've attached a patch file which adds this feature along with a couple of tests and documentation.</div><div><span style="line-height: 1.5"><br /></span></div><div><span style="line-height: 1.5">Is this something that can be added to diff?</span></div><div><br /></div><div>David<br />
--
<br />
Securely sent with Tutanota. Claim your encrypted mailbox today!
<br />
<a href="https://tutanota.com" target="_blank">https://tutanota.com</a></div>  </body>
</html>

------=_Part_7699_495174991.1463840594101--

------=_Part_7698_1890366927.1463840594101
Content-Type: text/x-patch; charset=us-ascii; name=exclude-directory.patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=exclude-directory.patch

diff --git a/src/diff.c b/src/diff.c
index 9bc1d96..4420623 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -122,6 +122,7 @@ enum
   NO_IGNORE_FILE_NAME_CASE_OPTION,
   NORMAL_OPTION,
   SDIFF_MERGE_ASSIST_OPTION,
+  EXCLUDE_DIRECTORY_OPTION,
   STRIP_TRAILING_CR_OPTION,
   SUPPRESS_BLANK_EMPTY_OPTION,
   SUPPRESS_COMMON_LINES_OPTION,
@@ -208,6 +209,7 @@ static struct option const longopts[] =
   {"show-function-line", 1, 0, 'F'},
   {"side-by-side", 0, 0, 'y'},
   {"speed-large-files", 0, 0, 'H'},
+  {"exclude-directory", 0, 0, EXCLUDE_DIRECTORY_OPTION},
   {"starting-file", 1, 0, 'S'},
   {"strip-trailing-cr", 0, 0, STRIP_TRAILING_CR_OPTION},
   {"suppress-blank-empty", 0, 0, SUPPRESS_BLANK_EMPTY_OPTION},
@@ -592,6 +594,10 @@ main (int argc, char **argv)
 	  sdiff_merge_assist = true;
 	  break;
 
+	case EXCLUDE_DIRECTORY_OPTION:
+	  exclude_directory = true;
+	  break;
+
 	case STRIP_TRAILING_CR_OPTION:
 	  strip_trailing_cr = true;
 	  break;
@@ -911,6 +917,7 @@ static char const * const option_help_msgid[] = {
   N_("    --no-ignore-file-name-case  consider case when comparing file names"),
   N_("-x, --exclude=PAT               exclude files that match PAT"),
   N_("-X, --exclude-from=FILE         exclude files that match any pattern in FILE"),
+  N_("    --exclude-directory         exclude directories matching exclude pattern"),
   N_("-S, --starting-file=FILE        start with FILE when comparing directories"),
   N_("    --from-file=FILE1           compare FILE1 to all operands;\n"
      "                                  FILE1 can be a directory"),
diff --git a/src/diff.h b/src/diff.h
index 0983e7c..413790a 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -224,6 +224,9 @@ XTERN bool speed_large_files;
 /* Patterns that match file names to be excluded.  */
 XTERN struct exclude *excluded;
 
+/* Include directory as part of exclude matching. */
+XTERN bool exclude_directory;
+
 /* Don't discard lines.  This makes things slower (sometimes much
    slower) but will find a guaranteed minimal set of changes.  */
 XTERN bool minimal;
diff --git a/src/dir.c b/src/dir.c
index c8aa6a5..e9c70d6 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -96,8 +96,15 @@ dir_read (struct file_data const *dir, struct dirdata *dirdata)
 	      && (d_name[1] == 0 || (d_name[1] == '.' && d_name[2] == 0)))
 	    continue;
 
-	  if (excluded_file_name (excluded, d_name))
-	    continue;
+	  /* Exclude filename matches from diff */
+	  if (exclude_directory) {
+	    if (excluded_file_name (excluded,
+	      file_name_concat(dir->name, d_name, NULL)))
+	      continue;
+	  } else {
+	    if (excluded_file_name (excluded, d_name))
+	      continue;
+	  }
 
 	  while (data_alloc < data_used + d_size)
 	    {
diff --git a/tests/exclude-directory b/tests/exclude-directory
new file mode 100755
index 0000000..825154a
--- /dev/null
+++ b/tests/exclude-directory
@@ -0,0 +1,48 @@
+#!/bin/sh
+# exclude directory tests
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+TZ=UTC0
+export TZ
+
+fail=0
+
+# Generate directory structure
+mkdir a
+mkdir b
+echo ac > a/c
+echo bc > b/c
+
+epoch='1970-01-01 00:00:00'
+touch --date="$epoch" a b a/c b/c
+
+gen_exp_default()
+{
+    printf '%s' \
+"diff -r '--exclude=b/*' a/c b/c
+1c1
+< ac
+---
+> bc
+"
+}
+
+gen_exp_excluded()
+{
+    printf '%s' \
+"Only in a: c
+"
+}
+
+diff -r --exclude="b/*" a b > out
+test $? = 1 || fail=1
+gen_exp_default > exp || framework_failure_
+compare exp out || fail=1
+
+diff -r --exclude-directory --exclude="b/*" a b > out
+test $? = 1 || fail=1
+gen_exp_excluded > exp || framework_failure_
+compare exp out || fail=1
+
+Exit $fail

------=_Part_7698_1890366927.1463840594101--




From MAILER-DAEMON Tue May 24 15:15:09 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b5HnJ-0003FS-3a
	for mharc-bug-diffutils@gnu.org; Tue, 24 May 2016 15:15:09 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51599)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b5HnG-0003Cp-Sj
	for bug-diffutils@gnu.org; Tue, 24 May 2016 15:15:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b5HnB-0007YL-RO
	for bug-diffutils@gnu.org; Tue, 24 May 2016 15:15:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:52684)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b5HnB-0007YH-O3
	for bug-diffutils@gnu.org; Tue, 24 May 2016 15:15:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b5HnB-0005g7-LC
	for bug-diffutils@gnu.org; Tue, 24 May 2016 15:15:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Glenn Morris <rgm@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Tue, 24 May 2016 19:15:01 +0000
Resent-Message-ID: <handler.23613.B.146411727521761@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 23613
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 23613@debbugs.gnu.org
X-Debbugs-Original-To: submit@debbugs.gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.146411727521761
	(code B ref -1); Tue, 24 May 2016 19:15:01 +0000
Received: (at submit) by debbugs.gnu.org; 24 May 2016 19:14:35 +0000
Received: from localhost ([127.0.0.1]:36786 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b5Hml-0005ev-8r
	for submit@debbugs.gnu.org; Tue, 24 May 2016 15:14:35 -0400
Received: from eggs.gnu.org ([208.118.235.92]:60520)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <rgm@gnu.org>) id 1b5Hmh-0005eY-SN
	for submit@debbugs.gnu.org; Tue, 24 May 2016 15:14:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rgm@gnu.org>) id 1b5Hmb-0007U6-MI
	for submit@debbugs.gnu.org; Tue, 24 May 2016 15:14:26 -0400
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36167)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1b5Hmb-0007U1-J1
	for submit@debbugs.gnu.org; Tue, 24 May 2016 15:14:25 -0400
Received: from rgm by fencepost.gnu.org with local (Exim 4.82)
	(envelope-from <rgm@gnu.org>)
	id 1b5Hma-0001WS-Ri; Tue, 24 May 2016 15:14:24 -0400
From: Glenn Morris <rgm@gnu.org>
X-Spook: Social media ICE bank TSA National Operations Center
X-Ran: G6'(TyDjlh@noEZ%{,o'p"k#ZviNq#<7W.7V>dy=E09&*o^]1}UN)O8^c|+6Jh"2hn)EjE
X-Hue: black
X-Attribution: GM
Date: Tue, 24 May 2016 15:14:24 -0400
Message-ID: <vmvb23i7zj.fsf@fencepost.gnu.org>
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#23613: Fix emerge xref in manual
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 May 2016 19:15:08 -0000

Package: diffutils
Severity: minor

Hi - the following fixes an xref from the diffutils manual to the Emacs one.

You might also want to add some redirects for the online version, like eg

http://web.cvs.savannah.gnu.org/viewvc/emacs/manual/.htaccess?root=emacs&view=markup


--- a/doc/diffutils.texi
+++ b/doc/diffutils.texi
@@ -2438,7 +2438,7 @@ put the merged text.  @xref{Invoking sdiff}, for more details on the
 options to @command{sdiff}.
 
 Another way to merge files interactively is to use the Emacs Lisp
-package @command{emerge}.  @xref{emerge, , emerge, emacs, The
+package @command{emerge}.  @xref{Emerge, , Emerge, emacs, The
 @acronym{GNU} Emacs Manual}, for more information.
 
 @menu




From MAILER-DAEMON Tue May 24 22:54:07 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b5OxT-0003JT-Hc
	for mharc-bug-diffutils@gnu.org; Tue, 24 May 2016 22:54:07 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37265)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b5OxR-0003Ig-GD
	for bug-diffutils@gnu.org; Tue, 24 May 2016 22:54:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b5OxO-0003FR-C2
	for bug-diffutils@gnu.org; Tue, 24 May 2016 22:54:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:52801)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b5OxO-0003FL-8g
	for bug-diffutils@gnu.org; Tue, 24 May 2016 22:54:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b5OxN-0004o3-UL
	for bug-diffutils@gnu.org; Tue, 24 May 2016 22:54:01 -0400
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-To: bug-diffutils@gnu.org
Resent-Date: Wed, 25 May 2016 02:54:01 +0000
Resent-Message-ID: <handler.23613.D23613.146414479518419.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 23613
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Glenn Morris <rgm@gnu.org>
Cc: 23613-done@debbugs.gnu.org
Mail-Followup-To: 23613@debbugs.gnu.org, jim@meyering.net, rgm@gnu.org
Received: via spool by 23613-done@debbugs.gnu.org id=D23613.146414479518419
	(code D ref 23613); Wed, 25 May 2016 02:54:01 +0000
Received: (at 23613-done) by debbugs.gnu.org; 25 May 2016 02:53:15 +0000
Received: from localhost ([127.0.0.1]:36905 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b5Owc-0004n1-OB
	for submit@debbugs.gnu.org; Tue, 24 May 2016 22:53:14 -0400
Received: from mail-oi0-f68.google.com ([209.85.218.68]:33898)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1b5Owa-0004mo-LB
	for 23613-done@debbugs.gnu.org; Tue, 24 May 2016 22:53:13 -0400
Received: by mail-oi0-f68.google.com with SMTP id r64so8269100oie.1
	for <23613-done@debbugs.gnu.org>; Tue, 24 May 2016 19:53:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc;
	bh=BAhwbXSQzanC0s2oES9lxysCWo/h6P9SN9lxceAXakM=;
	b=fkqYL6thEXdx1FTbw60Cz0NsSpQzwF7l5QKOGfmL6pySFYwlvQVD1zw4uBa220wZN0
	5DDmTiwgl5nIzLevWDDgKDJ0F82Q2FDpWn8wS9JpZqQaUdjXrUcxNODAVPZUQH4A1Ajs
	BXzQlFbTrlYDpa9CVeR+wVi3VulX94ndcTIp8vUvlbHcw/ajwZRHrQl6yXDgPCspFRyr
	5cxTw3QOBJ7+4pHmoFVz7Z099TKHW8/VYfY7ArQiKh+tWVOnnU9wlr9ePf2e30+8ZS+S
	jERkxBozPI/i4pJlS8oUToVdrxHPk1I5GYneBmc+0LNTxh4GvAtA98FrQgsjCKu22Pwo
	kBNg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc;
	bh=BAhwbXSQzanC0s2oES9lxysCWo/h6P9SN9lxceAXakM=;
	b=PhEbhC9SKjlCiDBwSvgsKZlvPAOgfeQdaydM6tVHUeR1skndDF3QM7BnOhg/pitQsE
	+sNE5zWRcYczRLsrOhYhZKyMC2T7g1lhXdVJdAY9qcePVoPekN6a3AlDl/TraEzCIEol
	Koe1bLjVIpOSGa7iDv9JPavLP3QouLgAyg8lmPyJlPHOZxWzen4i+ZCy6uN3LFejde4P
	plTSiNseYpE3tvUjzTfs8G9EipbkPxGYeuqgCSbQhoePt7IOHf8ZWb7fcK+AlnlGkAjJ
	BtzzT6AExrRFnqG5MqLdqH6kBuFPEeZX0l4Zq6VHyzhdPNpeofvTMlMUrG4s+UVISNyu
	W1Eg==
X-Gm-Message-State: ALyK8tJk4BwBYu9T5maGME4OGc4KHGd8LeTI0gMZ7NbPi5qnqDc/YL3MN2YqRQ46xnwfn6stAquw5TIismu3vw==
X-Received: by 10.157.11.236 with SMTP id 99mr792513oth.103.1464144786683;
	Tue, 24 May 2016 19:53:06 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.74.151 with HTTP; Tue, 24 May 2016 19:52:46 -0700 (PDT)
In-Reply-To: <vmvb23i7zj.fsf@fencepost.gnu.org>
References: <vmvb23i7zj.fsf@fencepost.gnu.org>
From: Jim Meyering <jim@meyering.net>
Date: Tue, 24 May 2016 19:52:46 -0700
X-Google-Sender-Auth: xlOYFL5XYGhZsLqQ6FmK_pSQCwo
Message-ID: <CA+8g5KExbqc_mUyDkozx0BadueyQOemVvByPr5EW_KYqFLVGZg@mail.gmail.com>
Content-Type: multipart/mixed; boundary=001a113526dae91eb60533a1c55f
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#23613:  bug#23613: Fix emerge xref in manual
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 May 2016 02:54:06 -0000

--001a113526dae91eb60533a1c55f
Content-Type: text/plain; charset=UTF-8

On Tue, May 24, 2016 at 12:14 PM, Glenn Morris <rgm@gnu.org> wrote:
> Package: diffutils
> Severity: minor
>
> Hi - the following fixes an xref from the diffutils manual to the Emacs one.
>
> You might also want to add some redirects for the online version, like eg
>
> http://web.cvs.savannah.gnu.org/viewvc/emacs/manual/.htaccess?root=emacs&view=markup

Does anyone else have automation to do that, or is it all done manually?

> --- a/doc/diffutils.texi
> +++ b/doc/diffutils.texi
> @@ -2438,7 +2438,7 @@ put the merged text.  @xref{Invoking sdiff}, for more details on the
>  options to @command{sdiff}.
>
>  Another way to merge files interactively is to use the Emacs Lisp
> -package @command{emerge}.  @xref{emerge, , emerge, emacs, The
> +package @command{emerge}.  @xref{Emerge, , Emerge, emacs, The
>  @acronym{GNU} Emacs Manual}, for more information.
>
>  @menu

Thanks. Here's the patch I will soon push. Holler if you'd like
anything to be changed:

--001a113526dae91eb60533a1c55f
Content-Type: text/x-patch; charset=US-ASCII; 
	name="0001-doc-fix-a-reference-to-emacs-emerge-node.patch"
Content-Disposition: attachment; 
	filename="0001-doc-fix-a-reference-to-emacs-emerge-node.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_iom9z6fl0

RnJvbSA3NTI2NzkxOTBjZjYxMGVhMzJjNTRkNjI1YzM2OGJiODdkYTE1NmZjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBHbGVubiBNb3JyaXMgPHJnbUBnbnUub3JnPgpEYXRlOiBUdWUs
IDI0IE1heSAyMDE2IDE5OjUxOjM2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gZG9jOiBmaXggYSBy
ZWZlcmVuY2UgdG8gZW1hY3MnIGVtZXJnZSBub2RlCgoqIGRvYy9kaWZmdXRpbHMudGV4aSAoSW50
ZXJhY3RpdmUgTWVyZ2luZyk6IENvcnJlY3QgYSByZWZlcmVuY2UgdG8KZW1hY3MnIGVtZXJnZSBu
b2RlOiBzL2VtZXJnZS9FbWVyZ2UvLgpUaGlzIGFkZHJlc3NlcyBodHRwOi8vZGViYnVncy5nbnUu
b3JnLzIzNjEzCi0tLQogZG9jL2RpZmZ1dGlscy50ZXhpIHwgMiArLQogMSBmaWxlIGNoYW5nZWQs
IDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL2RpZmZ1dGls
cy50ZXhpIGIvZG9jL2RpZmZ1dGlscy50ZXhpCmluZGV4IGI3YzdmYWQuLmI0NzgzODAgMTAwNjQ0
Ci0tLSBhL2RvYy9kaWZmdXRpbHMudGV4aQorKysgYi9kb2MvZGlmZnV0aWxzLnRleGkKQEAgLTI0
MzgsNyArMjQzOCw3IEBAIHB1dCB0aGUgbWVyZ2VkIHRleHQuICBAeHJlZntJbnZva2luZyBzZGlm
Zn0sIGZvciBtb3JlIGRldGFpbHMgb24gdGhlCiBvcHRpb25zIHRvIEBjb21tYW5ke3NkaWZmfS4K
CiBBbm90aGVyIHdheSB0byBtZXJnZSBmaWxlcyBpbnRlcmFjdGl2ZWx5IGlzIHRvIHVzZSB0aGUg
RW1hY3MgTGlzcAotcGFja2FnZSBAY29tbWFuZHtlbWVyZ2V9LiAgQHhyZWZ7ZW1lcmdlLCAsIGVt
ZXJnZSwgZW1hY3MsIFRoZQorcGFja2FnZSBAY29tbWFuZHtlbWVyZ2V9LiAgQHhyZWZ7RW1lcmdl
LCAsIEVtZXJnZSwgZW1hY3MsIFRoZQogQGFjcm9ueW17R05VfSBFbWFjcyBNYW51YWx9LCBmb3Ig
bW9yZSBpbmZvcm1hdGlvbi4KCiBAbWVudQotLSAKMi44LjAtcmMyCgo=
--001a113526dae91eb60533a1c55f--




From MAILER-DAEMON Sun May 29 01:48:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b6ta4-0006cp-SB
	for mharc-bug-diffutils@gnu.org; Sun, 29 May 2016 01:48:08 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34666)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b6ta2-0006bo-Me
	for bug-diffutils@gnu.org; Sun, 29 May 2016 01:48:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b6tZy-00047J-NB
	for bug-diffutils@gnu.org; Sun, 29 May 2016 01:48:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:32877)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b6tZy-00047F-JF
	for bug-diffutils@gnu.org; Sun, 29 May 2016 01:48:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b6tZy-0002D2-ET
	for bug-diffutils@gnu.org; Sun, 29 May 2016 01:48:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Claude <lamy.claude@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sun, 29 May 2016 05:48:02 +0000
Resent-Message-ID: <handler.23644.B.14645008408441@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 23644
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 23644@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.14645008408441
	(code B ref -1); Sun, 29 May 2016 05:48:02 +0000
Received: (at submit) by debbugs.gnu.org; 29 May 2016 05:47:20 +0000
Received: from localhost ([127.0.0.1]:45214 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b6tZI-0002C5-5q
	for submit@debbugs.gnu.org; Sun, 29 May 2016 01:47:20 -0400
Received: from eggs.gnu.org ([208.118.235.92]:36575)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <lamy.claude@gmail.com>) id 1b6rl4-0007pY-Pu
	for submit@debbugs.gnu.org; Sat, 28 May 2016 23:51:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lamy.claude@gmail.com>) id 1b6rky-0002VQ-9j
	for submit@debbugs.gnu.org; Sat, 28 May 2016 23:51:17 -0400
Received: from lists.gnu.org ([2001:4830:134:3::11]:35924)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lamy.claude@gmail.com>) id 1b6rky-0002VM-6H
	for submit@debbugs.gnu.org; Sat, 28 May 2016 23:51:16 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55773)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lamy.claude@gmail.com>) id 1b6rku-0003M7-0p
	for bug-diffutils@gnu.org; Sat, 28 May 2016 23:51:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lamy.claude@gmail.com>) id 1b6rkq-0002Up-Ei
	for bug-diffutils@gnu.org; Sat, 28 May 2016 23:51:11 -0400
Received: from mail-qk0-x230.google.com ([2607:f8b0:400d:c09::230]:36473)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lamy.claude@gmail.com>) id 1b6rkq-0002Tm-9X
	for bug-diffutils@gnu.org; Sat, 28 May 2016 23:51:08 -0400
Received: by mail-qk0-x230.google.com with SMTP id x7so103841508qkd.3
	for <bug-diffutils@gnu.org>; Sat, 28 May 2016 20:51:07 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=to:from:subject:message-id:date:user-agent:mime-version;
	bh=PLgf/sKQxq9QQ04hY14A6BdAHCWjfQURDZYkWSx5TeI=;
	b=n73BVQtO548D3xHO/i56FCRyl/OcTblYNjn0dkGFBiyu5nmHF3wF1HBm/qs0oyNUjE
	s6acW7bCGJ2XybBOnLSdj3OkzWhREWh9xXOijawwPHbqwgPKs+zYk/jBR8gJ8eEXTjCC
	zQCF3ReYJuHvyOs/wzNH9hys/alSXr8cA9XrByrQxQm3/IV4im4dhlmSqf2tCIm9aKK6
	o2PE3TlBaNpmBKqijqRV7JRCxSRYX+Ye+B7Klle1Cgsbod03lr0yWIVDuy1r9vE0XGDi
	5LuoL6/ctalVxYvIAfPzq2oyDnTiG5iNTPtT0MoeMO9eJsbORCpIg3n0ZP7or8uvM/xR
	DO9A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:to:from:subject:message-id:date:user-agent
	:mime-version;
	bh=PLgf/sKQxq9QQ04hY14A6BdAHCWjfQURDZYkWSx5TeI=;
	b=BXVcuzB0NP4miD3vmL9mZ51UQsn4WxBX8crfk6rff8mEuQA7VvCzNgCP31HGIom+C0
	LwXj/TuyAnXl06l1TPuA58tOGIwABfkbW7uwR4eDzuDp21+XDbsn5hBBe9sGj2KKlCfN
	BvKisc1GqT/nhhgqaZRuSBuTm8gfZevPoBwD0S6VhbC0dfzKa9vNlLve8suTnyTVMTeT
	h3SaUCtBBWk/rohMDlciQUunA0LQtwxm5HonTI1ogLMkIevnnvhnRKjHkVw/S5/lz5oD
	GNK1s9t9hBtUvDmYEe6LWHQknukD6SlppfgHJiWEwz4Swqq3JMIUoNYzcpvmli7rUi+2
	TUXA==
X-Gm-Message-State: ALyK8tJ4nSmNQSUcMuKHMXKiJq3ZPW3XQdNtAT6G9wwAvGm5WphNLLb3mPUWFGX7CJWdjg==
X-Received: by 10.55.177.130 with SMTP id a124mr21705165qkf.51.1464493867404; 
	Sat, 28 May 2016 20:51:07 -0700 (PDT)
Received: from [192.168.1.128] (modemcable144.88-80-70.mc.videotron.ca.
	[70.80.88.144]) by smtp.gmail.com with ESMTPSA id
	g10sm4892284qgg.13.2016.05.28.20.51.06
	for <bug-diffutils@gnu.org> (version=TLSv1/SSLv3 cipher=OTHER);
	Sat, 28 May 2016 20:51:06 -0700 (PDT)
From: Claude <lamy.claude@gmail.com>
Message-ID: <31147a1a-80b1-5b9f-6384-1fef34a09a61@gmail.com>
Date: Sat, 28 May 2016 23:51:07 -0400
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101
	Thunderbird/45.1.0
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------7B00E56853CD13D191616CDD"
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Mailman-Approved-At: Sun, 29 May 2016 01:47:18 -0400
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#23644: bug with context greater than 0
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 May 2016 05:48:08 -0000

This is a multi-part message in MIME format.
--------------7B00E56853CD13D191616CDD
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi

I think I have found a bug with diff when context is greater then zero.
I have included the two files and the diff file produced.

This diff file has been generated with version 2.7 running on Windows 7.
The same behavior have been noticed with version 3.3 running on linux.

My command was  diff -C 2 original.txt modified.txt

Now looking on the produced diff file, I had two additions.  At the 
beggining and at the end of my modified file.

*** Original.txt    Sat May 28 09:07:08 2016
--- Modified.txt    Sat May 28 09:07:18 2016
***************
*** 1,2 ****
--- 1,8 ----
+ This is an important
+ notice! It should
+ therefore be located at
+ the beginning of this
+ document!
+
   This part of the
   document has stayed the
***************
*** 6,20 ****
   change.  Otherwise, that
   would not be helping to
! compress the size of the
! changes.
!
! This paragraph contains
! text that is outdated.
! It will be deleted in the
! near future.

   allo
   It is important to spell
! check this dokument. On
   the other hand, a
   misspelled word isn't
--- 12,20 ----
   change.  Otherwise, that
   would not be helping to
! compress anything.

   allo
   It is important to spell
! check this document. On
   the other hand, a
   misspelled word isn't
***************
*** 24,25 ****
--- 24,29 ----
   be changed. Things can
   be added after it.
+
+ This paragraph contains
+ important new additions
+ to this document.

Notice that  on the original file diff specifies that it will list 
context lines content 1,2 for the
beginning and 24,25 for the end, but the lines are not displayed in the 
diff block description.
The two context lines appear for the modified files for the same 
differences though.
Also, the two context lines are displayed, at top, and at bottom when 
differences occure in the middle of the file.

I have no corrections for this bug.  I haven't looked at the code.

Thanks



--------------7B00E56853CD13D191616CDD
Content-Type: text/plain; charset=UTF-8;
 name="Original.txt"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="Original.txt"

VGhpcyBwYXJ0IG9mIHRoZQ0KZG9jdW1lbnQgaGFzIHN0YXllZCB0aGUNCnNhbWUgZnJvbSB2
ZXJzaW9uIHRvDQp2ZXJzaW9uLiAgSXQgc2hvdWxkbid0DQpiZSBzaG93biBpZiBpdCBkb2Vz
bid0DQpjaGFuZ2UuICBPdGhlcndpc2UsIHRoYXQNCndvdWxkIG5vdCBiZSBoZWxwaW5nIHRv
DQpjb21wcmVzcyB0aGUgc2l6ZSBvZiB0aGUNCmNoYW5nZXMuDQoNClRoaXMgcGFyYWdyYXBo
IGNvbnRhaW5zDQp0ZXh0IHRoYXQgaXMgb3V0ZGF0ZWQuDQpJdCB3aWxsIGJlIGRlbGV0ZWQg
aW4gdGhlDQpuZWFyIGZ1dHVyZS4NCg0KYWxsbw0KSXQgaXMgaW1wb3J0YW50IHRvIHNwZWxs
DQpjaGVjayB0aGlzIGRva3VtZW50LiBPbg0KdGhlIG90aGVyIGhhbmQsIGENCm1pc3NwZWxs
ZWQgd29yZCBpc24ndA0KdGhlIGVuZCBvZiB0aGUgd29ybGQuDQpOb3RoaW5nIGluIHRoZSBy
ZXN0IG9mDQp0aGlzIHBhcmFncmFwaCBuZWVkcyB0bw0KYmUgY2hhbmdlZC4gVGhpbmdzIGNh
bg0KYmUgYWRkZWQgYWZ0ZXIgaXQuDQo=
--------------7B00E56853CD13D191616CDD
Content-Type: text/plain; charset=UTF-8;
 name="differences-context-2.txt"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="differences-context-2.txt"

KioqIE9yaWdpbmFsLnR4dAlTYXQgTWF5IDI4IDA5OjA3OjA4IDIwMTYNCi0tLSBNb2RpZmll
ZC50eHQJU2F0IE1heSAyOCAwOTowNzoxOCAyMDE2DQoqKioqKioqKioqKioqKioNCioqKiAx
LDIgKioqKg0KLS0tIDEsOCAtLS0tDQorIFRoaXMgaXMgYW4gaW1wb3J0YW50DQorIG5vdGlj
ZSEgSXQgc2hvdWxkDQorIHRoZXJlZm9yZSBiZSBsb2NhdGVkIGF0DQorIHRoZSBiZWdpbm5p
bmcgb2YgdGhpcw0KKyBkb2N1bWVudCENCisgDQogIFRoaXMgcGFydCBvZiB0aGUNCiAgZG9j
dW1lbnQgaGFzIHN0YXllZCB0aGUNCioqKioqKioqKioqKioqKg0KKioqIDYsMjAgKioqKg0K
ICBjaGFuZ2UuICBPdGhlcndpc2UsIHRoYXQNCiAgd291bGQgbm90IGJlIGhlbHBpbmcgdG8N
CiEgY29tcHJlc3MgdGhlIHNpemUgb2YgdGhlDQohIGNoYW5nZXMuDQohIA0KISBUaGlzIHBh
cmFncmFwaCBjb250YWlucw0KISB0ZXh0IHRoYXQgaXMgb3V0ZGF0ZWQuDQohIEl0IHdpbGwg
YmUgZGVsZXRlZCBpbiB0aGUNCiEgbmVhciBmdXR1cmUuDQogIA0KICBhbGxvDQogIEl0IGlz
IGltcG9ydGFudCB0byBzcGVsbA0KISBjaGVjayB0aGlzIGRva3VtZW50LiBPbg0KICB0aGUg
b3RoZXIgaGFuZCwgYQ0KICBtaXNzcGVsbGVkIHdvcmQgaXNuJ3QNCi0tLSAxMiwyMCAtLS0t
DQogIGNoYW5nZS4gIE90aGVyd2lzZSwgdGhhdA0KICB3b3VsZCBub3QgYmUgaGVscGluZyB0
bw0KISBjb21wcmVzcyBhbnl0aGluZy4NCiAgDQogIGFsbG8NCiAgSXQgaXMgaW1wb3J0YW50
IHRvIHNwZWxsDQohIGNoZWNrIHRoaXMgZG9jdW1lbnQuIE9uDQogIHRoZSBvdGhlciBoYW5k
LCBhDQogIG1pc3NwZWxsZWQgd29yZCBpc24ndA0KKioqKioqKioqKioqKioqDQoqKiogMjQs
MjUgKioqKg0KLS0tIDI0LDI5IC0tLS0NCiAgYmUgY2hhbmdlZC4gVGhpbmdzIGNhbg0KICBi
ZSBhZGRlZCBhZnRlciBpdC4NCisgDQorIFRoaXMgcGFyYWdyYXBoIGNvbnRhaW5zDQorIGlt
cG9ydGFudCBuZXcgYWRkaXRpb25zDQorIHRvIHRoaXMgZG9jdW1lbnQuDQo=
--------------7B00E56853CD13D191616CDD
Content-Type: text/plain; charset=UTF-8;
 name="Modified.txt"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="Modified.txt"

VGhpcyBpcyBhbiBpbXBvcnRhbnQNCm5vdGljZSEgSXQgc2hvdWxkDQp0aGVyZWZvcmUgYmUg
bG9jYXRlZCBhdA0KdGhlIGJlZ2lubmluZyBvZiB0aGlzDQpkb2N1bWVudCENCg0KVGhpcyBw
YXJ0IG9mIHRoZQ0KZG9jdW1lbnQgaGFzIHN0YXllZCB0aGUNCnNhbWUgZnJvbSB2ZXJzaW9u
IHRvDQp2ZXJzaW9uLiAgSXQgc2hvdWxkbid0DQpiZSBzaG93biBpZiBpdCBkb2Vzbid0DQpj
aGFuZ2UuICBPdGhlcndpc2UsIHRoYXQNCndvdWxkIG5vdCBiZSBoZWxwaW5nIHRvDQpjb21w
cmVzcyBhbnl0aGluZy4NCg0KYWxsbw0KSXQgaXMgaW1wb3J0YW50IHRvIHNwZWxsDQpjaGVj
ayB0aGlzIGRvY3VtZW50LiBPbg0KdGhlIG90aGVyIGhhbmQsIGENCm1pc3NwZWxsZWQgd29y
ZCBpc24ndA0KdGhlIGVuZCBvZiB0aGUgd29ybGQuDQpOb3RoaW5nIGluIHRoZSByZXN0IG9m
DQp0aGlzIHBhcmFncmFwaCBuZWVkcyB0bw0KYmUgY2hhbmdlZC4gVGhpbmdzIGNhbg0KYmUg
YWRkZWQgYWZ0ZXIgaXQuDQoNClRoaXMgcGFyYWdyYXBoIGNvbnRhaW5zDQppbXBvcnRhbnQg
bmV3IGFkZGl0aW9ucw0KdG8gdGhpcyBkb2N1bWVudC4NCg==
--------------7B00E56853CD13D191616CDD--




From MAILER-DAEMON Sun May 29 02:48:12 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b6uWC-0005CH-8V
	for mharc-bug-diffutils@gnu.org; Sun, 29 May 2016 02:48:12 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39122)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b6uW8-0005C8-MY
	for bug-diffutils@gnu.org; Sun, 29 May 2016 02:48:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b6uW2-0005eR-Fz
	for bug-diffutils@gnu.org; Sun, 29 May 2016 02:48:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:32888)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b6uW2-0005eC-Cv
	for bug-diffutils@gnu.org; Sun, 29 May 2016 02:48:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b6uW1-0003if-Pf
	for bug-diffutils@gnu.org; Sun, 29 May 2016 02:48:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Paul Eggert <eggert@cs.ucla.edu>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sun, 29 May 2016 06:48:01 +0000
Resent-Message-ID: <handler.23644.B23644.146450442514236@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 23644
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Claude <lamy.claude@gmail.com>, 23644@debbugs.gnu.org
Received: via spool by 23644-submit@debbugs.gnu.org id=B23644.146450442514236
	(code B ref 23644); Sun, 29 May 2016 06:48:01 +0000
Received: (at 23644) by debbugs.gnu.org; 29 May 2016 06:47:05 +0000
Received: from localhost ([127.0.0.1]:45225 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b6uV6-0003hY-TS
	for submit@debbugs.gnu.org; Sun, 29 May 2016 02:47:05 -0400
Received: from zimbra.cs.ucla.edu ([131.179.128.68]:60575)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <eggert@cs.ucla.edu>) id 1b6uV5-0003h2-HT
	for 23644@debbugs.gnu.org; Sun, 29 May 2016 02:47:03 -0400
Received: from localhost (localhost [127.0.0.1])
	by zimbra.cs.ucla.edu (Postfix) with ESMTP id EBEC2161385;
	Sat, 28 May 2016 23:46:55 -0700 (PDT)
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
	by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032)
	with ESMTP id 5f4CKJsqooZD; Sat, 28 May 2016 23:46:55 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
	by zimbra.cs.ucla.edu (Postfix) with ESMTP id 46EAB1613F1;
	Sat, 28 May 2016 23:46:55 -0700 (PDT)
X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
	by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id YfzoJ5467Bxm; Sat, 28 May 2016 23:46:55 -0700 (PDT)
Received: from [192.168.1.9] (unknown [100.32.155.148])
	by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 258AB161385;
	Sat, 28 May 2016 23:46:55 -0700 (PDT)
References: <31147a1a-80b1-5b9f-6384-1fef34a09a61@gmail.com>
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
Message-ID: <574A905D.5080409@cs.ucla.edu>
Date: Sat, 28 May 2016 23:46:53 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
	Thunderbird/38.8.0
MIME-Version: 1.0
In-Reply-To: <31147a1a-80b1-5b9f-6384-1fef34a09a61@gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#23644: bug#23644: bug with context greater than
 0
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 May 2016 06:48:10 -0000

Claude wrote:
> Notice that  on the original file diff specifies that it will list context lines
> content 1,2 for the
> beginning and 24,25 for the end, but the lines are not displayed in the diff
> block description.

Yes they are; they are common context, e.g., lines 24-25 of the first file are 
the same as lines 24-25 of the second file, so they are displayed once with 
leading ' '.

> The two context lines appear for the modified files for the same differences
> though.
> Also, the two context lines are displayed, at top, and at bottom when
> differences occure in the middle of the file.

Sorry, I don't see the bugs here; the output looks OK to me.




From MAILER-DAEMON Sun May 29 15:51:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b76js-0004DS-Q5
	for mharc-bug-diffutils@gnu.org; Sun, 29 May 2016 15:51:08 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37511)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b76jr-0004CQ-1p
	for bug-diffutils@gnu.org; Sun, 29 May 2016 15:51:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b76jm-0008U7-0B
	for bug-diffutils@gnu.org; Sun, 29 May 2016 15:51:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:34311)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b76jl-0008U3-Tf
	for bug-diffutils@gnu.org; Sun, 29 May 2016 15:51:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b76jl-0002Kd-MA
	for bug-diffutils@gnu.org; Sun, 29 May 2016 15:51:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Eric Deplagne <Eric@Deplagne.name>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sun, 29 May 2016 19:51:01 +0000
Resent-Message-ID: <handler.23644.B.14645514528948@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 23644
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 23644@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.14645514528948
	(code B ref -1); Sun, 29 May 2016 19:51:01 +0000
Received: (at submit) by debbugs.gnu.org; 29 May 2016 19:50:52 +0000
Received: from localhost ([127.0.0.1]:46648 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b76jc-0002KF-28
	for submit@debbugs.gnu.org; Sun, 29 May 2016 15:50:52 -0400
Received: from eggs.gnu.org ([208.118.235.92]:46517)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <Eric@Deplagne.name>) id 1b76jZ-0002K1-Rl
	for submit@debbugs.gnu.org; Sun, 29 May 2016 15:50:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Eric@Deplagne.name>) id 1b76jT-0008TX-W1
	for submit@debbugs.gnu.org; Sun, 29 May 2016 15:50:44 -0400
Received: from lists.gnu.org ([2001:4830:134:3::11]:51433)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Eric@Deplagne.name>) id 1b76jT-0008TT-TN
	for submit@debbugs.gnu.org; Sun, 29 May 2016 15:50:43 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37485)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Eric@Deplagne.name>) id 1b76jR-000476-LZ
	for bug-diffutils@gnu.org; Sun, 29 May 2016 15:50:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Eric@Deplagne.name>) id 1b76jO-0008T8-6j
	for bug-diffutils@gnu.org; Sun, 29 May 2016 15:50:41 -0400
Received: from goldorak5.eric.deplagne.name ([213.246.56.18]:53723
	helo=exim4.goldorak5.eric.deplagne.name)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Eric@Deplagne.name>) id 1b76jN-0008Sy-Ta
	for bug-diffutils@gnu.org; Sun, 29 May 2016 15:50:38 -0400
Received: from [192.168.0.4] (helo=mail.eric.deplagne.name)
	by exim4.goldorak5.eric.deplagne.name with esmtp (Exim 4.72)
	(envelope-from <Eric@Deplagne.name>) id 1b76jH-0002As-3C
	for bug-diffutils@gnu.org; Sun, 29 May 2016 21:50:31 +0200
Received: from deplagne by mail.eric.deplagne.name with local (Exim 4.69)
	(envelope-from <Eric@Deplagne.name>) id 1b76jG-0002Ap-Vu
	for bug-diffutils@gnu.org; Sun, 29 May 2016 21:50:30 +0200
Date: Sun, 29 May 2016 21:50:30 +0200
From: Eric Deplagne <Eric@Deplagne.name>
Message-ID: <20160529195030.GL22583@mail.eric.deplagne.name>
References: <31147a1a-80b1-5b9f-6384-1fef34a09a61@gmail.com>
	<574A905D.5080409@cs.ucla.edu>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="IFrzt5yFNjsAZ17G"
Content-Disposition: inline
In-Reply-To: <574A905D.5080409@cs.ucla.edu>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#23644: bug#23644: bug#23644: bug with context
 greater than 0
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 May 2016 19:51:08 -0000


--IFrzt5yFNjsAZ17G
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sat, 28 May 2016 23:46:53 -0700, Paul Eggert wrote:
> Claude wrote:
>> Notice that  on the original file diff specifies that it will list conte=
xt lines
>> content 1,2 for the
>> beginning and 24,25 for the end, but the lines are not displayed in the =
diff
>> block description.
>
> Yes they are; they are common context, e.g., lines 24-25 of the first=20
> file are the same as lines 24-25 of the second file, so they are=20
> displayed once with leading ' '.
>
>> The two context lines appear for the modified files for the same differe=
nces
>> though.
>> Also, the two context lines are displayed, at top, and at bottom when
>> differences occure in the middle of the file.
>
> Sorry, I don't see the bugs here; the output looks OK to me.

  Same for me.

  Third chunk beginning line 24 in both files
  at first seemed odd to me,
  but there are as many less lines in chunk 2=20
  than there are more lines in chunk 1.

  So everything is fine.

--=20
  Eric Deplagne

--IFrzt5yFNjsAZ17G
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iD8DBQFXS0gGej7DisjVpq4RAjmUAJ9e08AYCcAYxtolHB3Qn7ADuOEmBQCfdUjD
xY0IeHqyS7lZyJ9PCLmD7mk=
=fylF
-----END PGP SIGNATURE-----

--IFrzt5yFNjsAZ17G--




From MAILER-DAEMON Tue May 31 10:55:09 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b7l4X-00061T-BB
	for mharc-bug-diffutils@gnu.org; Tue, 31 May 2016 10:55:09 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37144)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b7l4U-0005xG-Nv
	for bug-diffutils@gnu.org; Tue, 31 May 2016 10:55:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b7l4Q-0003WO-Gf
	for bug-diffutils@gnu.org; Tue, 31 May 2016 10:55:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:36178)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b7l4Q-0003WK-Ca
	for bug-diffutils@gnu.org; Tue, 31 May 2016 10:55:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1b7l4Q-0002V6-6y
	for bug-diffutils@gnu.org; Tue, 31 May 2016 10:55:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Tue, 31 May 2016 14:55:02 +0000
Resent-Message-ID: <handler.23644.B23644.14647064679567@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 23644
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: 23644@debbugs.gnu.org, Claude <lamy.claude@gmail.com>
Received: via spool by 23644-submit@debbugs.gnu.org id=B23644.14647064679567
	(code B ref 23644); Tue, 31 May 2016 14:55:02 +0000
Received: (at 23644) by debbugs.gnu.org; 31 May 2016 14:54:27 +0000
Received: from localhost ([127.0.0.1]:48515 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1b7l3r-0002UF-Av
	for submit@debbugs.gnu.org; Tue, 31 May 2016 10:54:27 -0400
Received: from mail-oi0-f52.google.com ([209.85.218.52]:35771)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1b7l3o-0002U0-73
	for 23644@debbugs.gnu.org; Tue, 31 May 2016 10:54:26 -0400
Received: by mail-oi0-f52.google.com with SMTP id w184so295059095oiw.2
	for <23644@debbugs.gnu.org>; Tue, 31 May 2016 07:54:24 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc;
	bh=NxrcuN+IkDFGZtHtP6UQZLFzfH4vZoiNdajbWHr/HK4=;
	b=fkY5rhcx1HF+caSCerT/JA6sUnJdWTVJUx05tpeu5W3I3oMT4KQ8ZfdgmgsoFyaX5D
	WhT4YsjaNkbqdMpLAVgwp63V3N6j1qtgaS/ilV9R3fYafQKFkblizDhHfOxONEUgJTfp
	waJCSVWnteHQhIiLfKNHIcFgSStKuS5PL9Dh+DAGWZvq1cDlFf6HcOBvyraapaJMclns
	XyVHqiubV6WWJbyjgm9uQa3e5pRzmpJQP1XHaqDaahalMVr3Yk74JjEkX64venYBlQAP
	ewi13m8Zphb0mib9FMsN8SDkZcnB8GQ1Cu3716sEa9oXSQxG8NoD+0/o6+9xx36NXRr3
	Vbsw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc;
	bh=NxrcuN+IkDFGZtHtP6UQZLFzfH4vZoiNdajbWHr/HK4=;
	b=U1ifBF02R68klFGk1YYHsn1dp3XEmW3EYeH48AA/g6f68vbZ71OvmaA5Dg893NlLfp
	f4uTEODoVPeRX1Ia0qEJfLsjydaqh9H8vlN/x5cAbqeGgcdBicm2gfpLwLMtICex4Y9J
	D97eWmMksxlSR0MUuUhTj9K1S30GETGQBBdSMvEanzaYpohXf/BooaOamWQwPQkPQGvQ
	BELgu5P06zl7Eob6GnVeA+RlvAri4nZAk30itfD1sIHXz7+XdB8JsbZTWFggRpgcQz4g
	60kF9AG8JXRkQC2ymKtNN7u/aZOeqk59p7p/8LySGTbpjID6XihR95OQ6gwafGpCRXn7
	6n6g==
X-Gm-Message-State: ALyK8tJMSE2VOT6YI5NQRXBcHwAjRGXqPkE8EDm3X3mlPgaONKl596Z7vpbKvC6fdtN6EJ/MksZut37StjbPAQ==
X-Received: by 10.157.3.117 with SMTP id 108mr19468123otv.172.1464706458195;
	Tue, 31 May 2016 07:54:18 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.202.74.151 with HTTP; Tue, 31 May 2016 07:53:58 -0700 (PDT)
In-Reply-To: <574A905D.5080409@cs.ucla.edu>
References: <31147a1a-80b1-5b9f-6384-1fef34a09a61@gmail.com>
	<574A905D.5080409@cs.ucla.edu>
From: Jim Meyering <jim@meyering.net>
Date: Tue, 31 May 2016 07:53:58 -0700
X-Google-Sender-Auth: Rxg8CME6uTaL3_UIpqbvjEFhcnU
Message-ID: <CA+8g5KGrAZAZpd8nzr0gxM_RH_1pb5SnP0mqPvUWap28KZxasw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#23644: bug#23644: bug#23644: bug with context
 greater than 0
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils/>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 31 May 2016 14:55:07 -0000

tags 23644 notabug
close 23644
thanks

On Sat, May 28, 2016 at 11:46 PM, Paul Eggert <eggert@cs.ucla.edu> wrote:
> Claude wrote:
>>
>> Notice that  on the original file diff specifies that it will list context
>> lines
>> content 1,2 for the
>> beginning and 24,25 for the end, but the lines are not displayed in the
>> diff
>> block description.
>
>
> Yes they are; they are common context, e.g., lines 24-25 of the first file
> are the same as lines 24-25 of the second file, so they are displayed once
> with leading ' '.
>
>> The two context lines appear for the modified files for the same
>> differences
>> though.
>> Also, the two context lines are displayed, at top, and at bottom when
>> differences occure in the middle of the file.
>
> Sorry, I don't see the bugs here; the output looks OK to me.

Same here, so I'm marking this auto-created 'issue' as a non-bug and closing it.




