X-Loop: help-debbugs@HIDDEN Subject: bug#23644: bug with context greater than 0 Resent-From: Claude <lamy.claude@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-diffutils@HIDDEN Resent-Date: Sun, 29 May 2016 05:48:02 +0000 Resent-Message-ID: <handler.23644.B.14645008408441 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 23644 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 23644 <at> debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@HIDDEN Received: via spool by submit <at> 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 <at> debbugs.gnu.org>) id 1b6tZI-0002C5-5q for submit <at> 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@HIDDEN>) id 1b6rl4-0007pY-Pu for submit <at> 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@HIDDEN>) id 1b6rky-0002VQ-9j for submit <at> debbugs.gnu.org; Sat, 28 May 2016 23:51:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <lamy.claude@HIDDEN>) id 1b6rky-0002VM-6H for submit <at> 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@HIDDEN>) id 1b6rku-0003M7-0p for bug-diffutils@HIDDEN; 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@HIDDEN>) id 1b6rkq-0002Up-Ei for bug-diffutils@HIDDEN; 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@HIDDEN>) id 1b6rkq-0002Tm-9X for bug-diffutils@HIDDEN; Sat, 28 May 2016 23:51:08 -0400 Received: by mail-qk0-x230.google.com with SMTP id x7so103841508qkd.3 for <bug-diffutils@HIDDEN>; 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@HIDDEN> (version=TLSv1/SSLv3 cipher=OTHER); Sat, 28 May 2016 20:51:06 -0700 (PDT) From: Claude <lamy.claude@HIDDEN> Message-ID: <31147a1a-80b1-5b9f-6384-1fef34a09a61@HIDDEN> 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Mailman-Approved-At: Sun, 29 May 2016 01:47:18 -0400 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -4.0 (----) 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--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Claude <lamy.claude@HIDDEN> Subject: bug#23644: Acknowledgement (bug with context greater than 0) Message-ID: <handler.23644.B.14645008408441.ack <at> debbugs.gnu.org> References: <31147a1a-80b1-5b9f-6384-1fef34a09a61@HIDDEN> X-Gnu-PR-Message: ack 23644 X-Gnu-PR-Package: diffutils Reply-To: 23644 <at> debbugs.gnu.org Date: Sun, 29 May 2016 05:48:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): bug-diffutils@HIDDEN If you wish to submit further information on this problem, please send it to 23644 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 23644: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D23644 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: bug#23644: [bug-diffutils] bug#23644: bug with context greater than 0 Resent-From: Paul Eggert <eggert@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-diffutils@HIDDEN Resent-Date: Sun, 29 May 2016 06:48:01 +0000 Resent-Message-ID: <handler.23644.B23644.146450442514236 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 23644 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: Claude <lamy.claude@HIDDEN>, 23644 <at> debbugs.gnu.org Received: via spool by 23644-submit <at> 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 <at> debbugs.gnu.org>) id 1b6uV6-0003hY-TS for submit <at> 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@HIDDEN>) id 1b6uV5-0003h2-HT for 23644 <at> 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@HIDDEN> From: Paul Eggert <eggert@HIDDEN> Organization: UCLA Computer Science Department Message-ID: <574A905D.5080409@HIDDEN> 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@HIDDEN> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.4 (-) 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.
X-Loop: help-debbugs@HIDDEN Subject: bug#23644: [bug-diffutils] bug#23644: bug#23644: bug with context greater than 0 Resent-From: Eric Deplagne <Eric@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-diffutils@HIDDEN Resent-Date: Sun, 29 May 2016 19:51:01 +0000 Resent-Message-ID: <handler.23644.B.14645514528948 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 23644 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 23644 <at> debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@HIDDEN Received: via spool by submit <at> 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 <at> debbugs.gnu.org>) id 1b76jc-0002KF-28 for submit <at> 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@HIDDEN>) id 1b76jZ-0002K1-Rl for submit <at> 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@HIDDEN>) id 1b76jT-0008TX-W1 for submit <at> debbugs.gnu.org; Sun, 29 May 2016 15:50:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:51433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <Eric@HIDDEN>) id 1b76jT-0008TT-TN for submit <at> 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@HIDDEN>) id 1b76jR-000476-LZ for bug-diffutils@HIDDEN; 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@HIDDEN>) id 1b76jO-0008T8-6j for bug-diffutils@HIDDEN; 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@HIDDEN>) id 1b76jN-0008Sy-Ta for bug-diffutils@HIDDEN; 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@HIDDEN>) id 1b76jH-0002As-3C for bug-diffutils@HIDDEN; Sun, 29 May 2016 21:50:31 +0200 Received: from deplagne by mail.eric.deplagne.name with local (Exim 4.69) (envelope-from <Eric@HIDDEN>) id 1b76jG-0002Ap-Vu for bug-diffutils@HIDDEN; Sun, 29 May 2016 21:50:30 +0200 Date: Sun, 29 May 2016 21:50:30 +0200 From: Eric Deplagne <Eric@HIDDEN> Message-ID: <20160529195030.GL22583@HIDDEN> References: <31147a1a-80b1-5b9f-6384-1fef34a09a61@HIDDEN> <574A905D.5080409@HIDDEN> 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@HIDDEN> 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -5.0 (-----) --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--
X-Loop: help-debbugs@HIDDEN Subject: bug#23644: [bug-diffutils] bug#23644: bug#23644: bug with context greater than 0 Resent-From: Jim Meyering <jim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-diffutils@HIDDEN Resent-Date: Tue, 31 May 2016 14:55:02 +0000 Resent-Message-ID: <handler.23644.B23644.14647064679567 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 23644 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: Paul Eggert <eggert@HIDDEN> Cc: 23644 <at> debbugs.gnu.org, Claude <lamy.claude@HIDDEN> Received: via spool by 23644-submit <at> 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 <at> debbugs.gnu.org>) id 1b7l3r-0002UF-Av for submit <at> 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@HIDDEN>) id 1b7l3o-0002U0-73 for 23644 <at> 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 <at> 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@HIDDEN> References: <31147a1a-80b1-5b9f-6384-1fef34a09a61@HIDDEN> <574A905D.5080409@HIDDEN> From: Jim Meyering <jim@HIDDEN> Date: Tue, 31 May 2016 07:53:58 -0700 X-Google-Sender-Auth: Rxg8CME6uTaL3_UIpqbvjEFhcnU Message-ID: <CA+8g5KGrAZAZpd8nzr0gxM_RH_1pb5SnP0mqPvUWap28KZxasw@HIDDEN> Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.5 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) tags 23644 notabug close 23644 thanks On Sat, May 28, 2016 at 11:46 PM, Paul Eggert <eggert@HIDDEN> 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.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.