From MAILER-DAEMON Fri Nov 03 16:16:10 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1eAiNt-0005yC-Vo
	for mharc-bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:16:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46779)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eAiNp-0005wK-HJ
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:16:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eAiNm-0008Fz-Ah
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:16:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:41203)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1eAiNm-0008Fn-69
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:16:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eAiNl-0002fl-Ts
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:16:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Kevin Hunter Kesling <hunteke@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 03 Nov 2017 20:16:01 +0000
Resent-Message-ID: <handler.29139.B.150974013010231@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 29139
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 29139@debbugs.gnu.org
X-Debbugs-Original-To: Diffutils Bug List <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.150974013010231
	(code B ref -1); Fri, 03 Nov 2017 20:16:01 +0000
Received: (at submit) by debbugs.gnu.org; 3 Nov 2017 20:15:30 +0000
Received: from localhost ([127.0.0.1]:49884 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1eAiNG-0002ev-46
	for submit@debbugs.gnu.org; Fri, 03 Nov 2017 16:15:30 -0400
Received: from eggs.gnu.org ([208.118.235.92]:55441)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <hunteke@gmail.com>) id 1eAiM0-0002cK-BZ
	for submit@debbugs.gnu.org; Fri, 03 Nov 2017 16:14:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <hunteke@gmail.com>) id 1eAiLt-00071b-Q8
	for submit@debbugs.gnu.org; Fri, 03 Nov 2017 16:14:07 -0400
Received: from lists.gnu.org ([2001:4830:134:3::11]:35840)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <hunteke@gmail.com>) id 1eAiLt-00071W-Kq
	for submit@debbugs.gnu.org; Fri, 03 Nov 2017 16:14:05 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46407)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <hunteke@gmail.com>) id 1eAiLr-00054I-Ve
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:14:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <hunteke@gmail.com>) id 1eAiLo-0006xo-Os
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:14:03 -0400
Received: from mail-io0-x22b.google.com ([2607:f8b0:4001:c06::22b]:49131)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <hunteke@gmail.com>) id 1eAiLo-0006xV-GE
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:14:00 -0400
Received: by mail-io0-x22b.google.com with SMTP id d66so8818854ioe.5
	for <bug-diffutils@gnu.org>; Fri, 03 Nov 2017 13:14:00 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; 
	h=to:from:subject:message-id:date:user-agent:mime-version
	:content-language;
	bh=JkQTkmUy6CiBKed2SpQMWG2eF/AWzDY3UpJhc8tWiQA=;
	b=QCRmh/86kqR6QP0esqg7tj0KpJeohHVwWialyU3eF7rQUrFljUS1j9z4ZPCcgk2ixy
	uZYhaxRsM20N507doVkbf6Dy9ums3SnPJyoDkASQgyaoBVrItHGSaoK4ldgDMhJBzvqr
	6PWMOETNICibcwZM4npDS5X4/VqUnTHYZ1la0MR59f7hpM6J+E1ki/27BThlgx8nXDv+
	6PmIpUak+fPre63GMdJ4cwba5p4uQrwIxscU8hme0aX1reDYaFg8ncn4xB7LoiqdJgkU
	mVKsMILUlMZoN4PI1jccF10TaPo+0vljQ3t0tppZQ7UBgiApjdjAEQkY1Wkg+QTDFPHQ
	Nptg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:to:from:subject:message-id:date:user-agent
	:mime-version:content-language;
	bh=JkQTkmUy6CiBKed2SpQMWG2eF/AWzDY3UpJhc8tWiQA=;
	b=Ruq6EzgwQnHmAaRXLH+bSjOBq5/20cX1KAyh0FomUYcF70Pnks0i46xOg/N/37yqpp
	A71Wz0mLYYg9uDH+BsZM7EjZlS4Reg++GglPkV7Q8PESksY3u1buwG30WVyHxthzcEod
	1FuJvd/mdR1IbtRBqxu/32CrkSTKaWPiL/ZhXrbHHpmUuemFt+x1IiB+VWxAkQtVOQjM
	Tf7PGYiji+RMJrYROSKzVtJbYFA7YrTnX+gNOqiHJ45wjtEDzhha3LtP7z+zvXejo0oR
	wNjQ/WzvWNWZuFdW7VtCXOYyRrQB+fLzM6xZO5VMacb1d9AjJccgROWwxlcVyxbueRW0
	Bvhg==
X-Gm-Message-State: AJaThX7o9i+CaObV+6SYIoscCNnYnb+KtnpQ0qQSXRoA/c3MDFuZH+79
	skRlzBKRj0Ed4jkay69UVmsYFA==
X-Google-Smtp-Source: ABhQp+TrZtMyaj7DmqI4/rwXJm+Pu2ulOBuAAUjXeOdeOIN1AuM6sxFxJKVLjAqj6hZJLRcWp3/MKQ==
X-Received: by 10.107.46.32 with SMTP id i32mr10027771ioo.8.1509740039285;
	Fri, 03 Nov 2017 13:13:59 -0700 (PDT)
Received: from [10.45.1.112] (rrcs-97-78-212-242.se.biz.rr.com.
	[97.78.212.242]) by smtp.googlemail.com with ESMTPSA id
	l206sm1549123ita.29.2017.11.03.13.13.57 for <bug-diffutils@gnu.org>
	(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Fri, 03 Nov 2017 13:13:58 -0700 (PDT)
From: Kevin Hunter Kesling <hunteke@gmail.com>
Message-ID: <a654916a-502c-f1dc-d115-2672aced4d29@gmail.com>
Date: Fri, 3 Nov 2017 16:13:57 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
	Thunderbird/52.4.0
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------F5C7DDBEDF82FA878CE0B3E8"
Content-Language: en-US
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Mailman-Approved-At: Fri, 03 Nov 2017 16:15:28 -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#29139: add --include for recursive searches
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: Fri, 03 Nov 2017 20:16:08 -0000

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

Hello List,

I've been annoyed and confused when I'm on autopilot and attempting to 
recursively compare directory trees.  I've become accustomed to Grep's 
--include functionality, and have more than a few times been surprised 
(to the tune of "What? Unrecognized option??") that diff does not have 
it.  Well, with the attached patch, it now does.

Thanks to diff and grep both using gnulib, and the expressiveness of 
add_exclude(), this was a much easier change that I was expecting when I 
embarked on this a couple of hours ago.

Further, in the past hour since implementing it, this patch has already 
saved me a ton of time (no thanks to an unfortunately slow VPN setup and 
other beleaguered business requirements).

Use is exactly like with grep.  For example:

     $ diff --recursive --brief -w --include="*.c" --include="*.h"  \
         dir1/   \
         dir2/

Would this be of use to the community?

Thanks,

Kevin

--------------F5C7DDBEDF82FA878CE0B3E8
Content-Type: text/x-patch;
 name="diff-Add-include-command-line-option.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="diff-Add-include-command-line-option.patch"

>From 9b5ff988f8c49a179ee64dbb075cb289b0c1868c Mon Sep 17 00:00:00 2001
From: Kevin Hunter Kesling <hunteke@gmail.com>
Date: Fri, 3 Nov 2017 11:36:03 -0400
Subject: [PATCH] diff: Add include command line option

Referencing a number of requests, both public[1] and internal, this
patch now enables --include, in a similar vein to grep's --include.
Heavy thanks to grep's sourcecode for having already solved this wheel.

[1] "Only include files that match a given pattern in a recursive diff"
https://stackoverflow.com/questions/10131908/
---
 NEWS                  |  3 +++
 doc/diffutils.texi    |  6 ++++++
 src/diff.c            | 14 +++++++++++---
 tests/Makefile.am     |  3 ++-
 tests/include-exclude | 23 +++++++++++++++++++++++
 5 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100755 tests/include-exclude

diff --git a/NEWS b/NEWS
index 949136c..89afd91 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ GNU diffutils NEWS                                    -*- outline -*-
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** New features
+
+ With --include, diff now can include file patterns, like grep.
 
 * Noteworthy changes in release 3.6 (2017-05-21) [stable]
 
diff --git a/doc/diffutils.texi b/doc/diffutils.texi
index 8479b3f..5bca8ee 100644
--- a/doc/diffutils.texi
+++ b/doc/diffutils.texi
@@ -3842,6 +3842,12 @@ comparison of @file{d} to @file{e} might compare the contents of
 might compare the contents of @file{d/Init} and @file{inIt}.
 @xref{Comparing Directories}.
 
+@item --include=@var{glob}
+@cindex include files
+@cindex searching directory trees
+When comparing directories, only compare files whose name matches @var{glob}.
+@xref{Comparing Directories}.
+
 @item -l
 @itemx --paginate
 Pass the output through @command{pr} to paginate it.  @xref{Pagination}.
diff --git a/src/diff.c b/src/diff.c
index df3338c..8252264 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -144,6 +144,7 @@ enum
   COLOR_PALETTE_OPTION,
 
   PRESUME_OUTPUT_TTY_OPTION,
+  INCLUDE_OPTION,
 };
 
 static char const group_format_option[][sizeof "--unchanged-group-format"] =
@@ -185,6 +186,7 @@ static struct option const longopts[] =
   {"ignore-space-change", 0, 0, 'b'},
   {"ignore-tab-expansion", 0, 0, 'E'},
   {"ignore-trailing-space", 0, 0, 'Z'},
+  {"include", 1, 0, INCLUDE_OPTION},
   {"inhibit-hunk-merge", 0, 0, INHIBIT_HUNK_MERGE_OPTION},
   {"initial-tab", 0, 0, 'T'},
   {"label", 1, 0, 'L'},
@@ -648,9 +650,14 @@ main (int argc, char **argv)
 	  set_color_palette (optarg);
 	  break;
 
-        case PRESUME_OUTPUT_TTY_OPTION:
-          presume_output_tty = true;
-          break;
+	case PRESUME_OUTPUT_TTY_OPTION:
+	  presume_output_tty = true;
+	  break;
+
+	case INCLUDE_OPTION:
+	  add_exclude (excluded, optarg, 0);
+	  add_exclude (excluded, optarg, EXCLUDE_WILDCARDS | EXCLUDE_INCLUDE | EXCLUDE_ANCHORED);
+	  break;
 
 	default:
 	  try_help (NULL, NULL);
@@ -919,6 +926,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_("    --include=PAT               include files that match PAT"),
   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/tests/Makefile.am b/tests/Makefile.am
index 6668863..ef236c7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,8 @@ TESTS = \
   invalid-re	\
   function-line-vs-leading-space \
   ignore-matching-lines \
-  label-vs-func	\
+  include-exclude       \
+  label-vs-func         \
   new-file \
   no-dereference \
   no-newline-at-eof \
diff --git a/tests/include-exclude b/tests/include-exclude
new file mode 100755
index 0000000..260d552
--- /dev/null
+++ b/tests/include-exclude
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Use of any --include or --exclude* option would segfault in 2.6 and 2.6.1
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+mkdir -p x1/dir x2/dir || framework_failure_
+echo aaa > x1/a     || framework_failure_
+echo bbb > x1/b     || framework_failure_
+echo ddd > x1/dir/d || framework_failure_
+echo aaa > x2/a     || framework_failure_
+echo bbb > x2/c     || framework_failure_
+echo ddd > x2/dir/d || framework_failure_
+
+printf '%s\n' "Only in x1: b" "Only in x2: c" > only-in-b-c   || framework_failure_
+
+diff -r --exclude='a*' x1 x2 > out
+sort -o out out || framework_failure_
+compare only-in-b-c out > /tmp/t
+
+diff -r --include='a*' x1 x2 > out
+sort -o out out || framework_failure_
+compare only-in-b-c out || fail=1
+
+Exit $fail
-- 
2.7.4


--------------F5C7DDBEDF82FA878CE0B3E8--




From MAILER-DAEMON Fri Nov 03 16:42:10 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1eAin4-0007hL-Ab
	for mharc-bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:42:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52536)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eAin1-0007hE-Ub
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:42:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eAimx-0006Uf-2v
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:42:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:41212)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1eAimw-0006UK-VE
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:42:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eAimw-0003I4-0d
	for bug-diffutils@gnu.org; Fri, 03 Nov 2017 16:42:02 -0400
X-Loop: help-debbugs@gnu.org
References: <a654916a-502c-f1dc-d115-2672aced4d29@gmail.com>
In-Reply-To: <a654916a-502c-f1dc-d115-2672aced4d29@gmail.com>
Resent-From: Kevin Hunter Kesling <hunteke@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 03 Nov 2017 20:42:01 +0000
Resent-Message-ID: <handler.29139.B29139.150974171312632@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 29139
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 29139@debbugs.gnu.org
Received: via spool by 29139-submit@debbugs.gnu.org id=B29139.150974171312632
	(code B ref 29139); Fri, 03 Nov 2017 20:42:01 +0000
Received: (at 29139) by debbugs.gnu.org; 3 Nov 2017 20:41:53 +0000
Received: from localhost ([127.0.0.1]:49893 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1eAimn-0003Hg-FL
	for submit@debbugs.gnu.org; Fri, 03 Nov 2017 16:41:53 -0400
Received: from mail-io0-f179.google.com ([209.85.223.179]:48259)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <hunteke@gmail.com>) id 1eAimm-0003HU-Q2
	for 29139@debbugs.gnu.org; Fri, 03 Nov 2017 16:41:53 -0400
Received: by mail-io0-f179.google.com with SMTP id d66so8962216ioe.5
	for <29139@debbugs.gnu.org>; Fri, 03 Nov 2017 13:41:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; 
	h=to:from:subject:message-id:date:user-agent:mime-version
	:content-language:content-transfer-encoding;
	bh=UlayPyd2qDzAFeYVzK9w7YESVg0u71pN7tqdBqY8QU0=;
	b=Tz522rwW9/KeeGWBuxA88/HnGn6y/ekptMYrmr2i3l6qoQF0OnZX9O5fnXazS38OeH
	NEEiZ1gN4lFUEX+/Kav8KP/V5nJPSI8ii9r7qVU+ZWV3UBzMBbVJ4V/+je2VLmpbPKmG
	ZH/GglI8JjAzCoP4wE4g9iJE0nnc8qQ+xDV/aSfgl8hLxvJztzdg5CZCJ+4Oq/zLqH35
	SmNX5msc+xG9EnoR/vpFBb7g26Hu44qe8p32sEF4E8NFlBSeq2Rk6r6hgi4UnrFmBzwi
	Hog8j5B1WkAp7kOS+YT+F24vCSQFpPSYCqly7baU7fMfSZhfE4aC5fQrGxPTz+8p66nN
	Ih4Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:to:from:subject:message-id:date:user-agent
	:mime-version:content-language:content-transfer-encoding;
	bh=UlayPyd2qDzAFeYVzK9w7YESVg0u71pN7tqdBqY8QU0=;
	b=ln8wPHQjbkekCMzk5zXxY7xIqyaMvK/9eGopJqYEum+KC3a0IkhhIrJq6D5+kAHvSP
	m95tmx1ngkLZXdw4PWpG9pW+RtlY1PJhifWfQ82w78toJRWgM3VSCOtZuMVXqBoZ0KnR
	o6wAaylcGmFvEjSs7O3QxldJ68wff8KrtI1wz4Zl+dEHDi63QfZogfgKKSmDT7Faohxr
	LzUUkdtAnHCzVvQOtaXMRk0CaB1p7GXxyCKHUz0uDh0VQlAr+gMP/8RfriHtyY56rGtA
	HX9anHa2+oBtOfuLjD6o6WxmaMAiEGLAhbwKQHwkni7R1rYoode2KisVI4zdXTZOsAjb
	Bkow==
X-Gm-Message-State: AJaThX4gjchI46zF5pKWvrrmWJgynn42T42f+r312APk2WitQ4X+hDFH
	7vV1qpii5uDKIZz5mM1j90h5DA==
X-Google-Smtp-Source: ABhQp+TapEaRBx18QFi6n9ywNrE9ss0kDL2GoAjUudIsNDzhq5Il0586P/t2Vw/QmnVWZq4+yvxmXQ==
X-Received: by 10.36.53.15 with SMTP id k15mr308134ita.75.1509741706729;
	Fri, 03 Nov 2017 13:41:46 -0700 (PDT)
Received: from [10.45.1.112] (rrcs-97-78-212-242.se.biz.rr.com.
	[97.78.212.242]) by smtp.googlemail.com with ESMTPSA id
	191sm1531345itb.21.2017.11.03.13.41.45 for <29139@debbugs.gnu.org>
	(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Fri, 03 Nov 2017 13:41:45 -0700 (PDT)
From: Kevin Hunter Kesling <hunteke@gmail.com>
Message-ID: <555c9646-5356-1962-a110-5a6787df86e3@gmail.com>
Date: Fri, 3 Nov 2017 16:41:45 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
	Thunderbird/52.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
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#29139: Never mind
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: Fri, 03 Nov 2017 20:42:08 -0000

Having used it in a couple of ways which at first appeared to work, I've 
had a couple of use cases (of course, after I email the list) since 
surprise me.

Please ignore or delete; this patch has some more baking to do ...

Sorry for the noise.

Kevin




From MAILER-DAEMON Wed Nov 15 18:07:09 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1eF6lx-000363-79
	for mharc-bug-diffutils@gnu.org; Wed, 15 Nov 2017 18:07:09 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42286)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eF6lt-000359-Tt
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 18:07:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eF6lq-0007Bn-Pf
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 18:07:05 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:33589)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1eF6lq-0007BK-Kn
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 18:07:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eF6lq-0006R6-2g
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 18:07:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: "s3gmentationfault@gmail.com" <s3gmentationfault@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Wed, 15 Nov 2017 23:07:01 +0000
Resent-Message-ID: <handler.29311.B.151078720024709@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 29311
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 29311@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.151078720024709
	(code B ref -1); Wed, 15 Nov 2017 23:07:01 +0000
Received: (at submit) by debbugs.gnu.org; 15 Nov 2017 23:06:40 +0000
Received: from localhost ([127.0.0.1]:42270 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1eF6lT-0006QS-Ek
	for submit@debbugs.gnu.org; Wed, 15 Nov 2017 18:06:39 -0500
Received: from eggs.gnu.org ([208.118.235.92]:37331)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <s3gmentationfault@gmail.com>) id 1eF6Q9-0005sQ-0g
	for submit@debbugs.gnu.org; Wed, 15 Nov 2017 17:44:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <s3gmentationfault@gmail.com>) id 1eF6Q2-0003hn-NE
	for submit@debbugs.gnu.org; Wed, 15 Nov 2017 17:44:31 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:44065)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <s3gmentationfault@gmail.com>)
	id 1eF6Q2-0003hJ-KC
	for submit@debbugs.gnu.org; Wed, 15 Nov 2017 17:44:30 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56525)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <s3gmentationfault@gmail.com>) id 1eF6Q1-0005vC-5q
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 17:44:30 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <s3gmentationfault@gmail.com>) id 1eF6Py-0003cx-2J
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 17:44:29 -0500
Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:41671)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <s3gmentationfault@gmail.com>)
	id 1eF6Px-0003bU-QD
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 17:44:25 -0500
Received: by mail-wm0-x231.google.com with SMTP id b189so6019386wmd.0
	for <bug-diffutils@gnu.org>; Wed, 15 Nov 2017 14:44:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; 
	h=to:from:subject:message-id:date:user-agent:mime-version
	:content-transfer-encoding:content-language;
	bh=oRI31yaPHBDFD/3z0IKRC4FUm6htLnYntfvYB8CSrn4=;
	b=NXCP63hOtTKp3e+mzAJaV1dd5yfVLZPjy3jzZAef0B3javomlX/OrEz4B5NB7XWChh
	/Xi7xphwe5OOVLkALrJKq6kn6AsREv8NxwhhT+BhoTpUIbP+BUPEboxvw+AGmT8a+Ihg
	bflJ5qnY9BTqreLhHR3BP8ykzmy0845aZl240yGhQISkjsezwUXB6CtyU77jAfSHuc0A
	VvXe1cnMWEQtxg5UI7ZxD7G5eOTKaNWuagfj7/awAGXZMeknPJb7pfRDyXnSJaKpKUq3
	uElpn3tx3n93KvtMNO7ibbX858+YTb0a6krRND8pkSsGOgC/ctl/v8E/MJPbXawyBCZK
	X2Sg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:to:from:subject:message-id:date:user-agent
	:mime-version:content-transfer-encoding:content-language;
	bh=oRI31yaPHBDFD/3z0IKRC4FUm6htLnYntfvYB8CSrn4=;
	b=tgQLOEccVWZxvl06Q9BNcrcDTvfg4MMhwVRROz5qF/t3eSkXgjtKprYYqTipR8Pq56
	vXKShybmdUCdQWK0b5SYHGA3gMugWR+Xi3hEfovshD+QKyM1EJLHxZ2nlVcdVec3YkEE
	+FmEBFKMZJfjEjtzn7WpfNVQvGC61YWjrZ9PGwQyeWuYfxgjSGgacvqxzbvE/8CWo5j8
	yH/z8DMOWLp/ElT3ijnBNVPbBztmRmvyMDwFSO+V/Xvvf7ltGseDguJQmb4N5sdkEtVE
	301yT/BVSgnigjK9IBb4af7eR57Fhh3Tbg52NKBCgryoRMH/4x39S9l1/reFpIMfRRvt
	6BWA==
X-Gm-Message-State: AJaThX6e+fCKNDArRVR6VeAPlQfEa0ajBXQLaeDxzFS/59RZeOT5scM7
	/ceEHpXdqtLeGPBWnYRc389/wQZx
X-Google-Smtp-Source: AGs4zMYlXRK+8EboQ20VQS48dCCxBemYt76aH8moca0xtxgGgcXBqRiEVyZ82kYxNbOVzNYIaSUXLg==
X-Received: by 10.28.151.14 with SMTP id z14mr18680wmd.5.1510785863733;
	Wed, 15 Nov 2017 14:44:23 -0800 (PST)
Received: from [192.168.1.14] ([151.41.10.36])
	by smtp.gmail.com with ESMTPSA id
	p23sm41204586wrb.76.2017.11.15.14.44.22 for <bug-diffutils@gnu.org>
	(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Wed, 15 Nov 2017 14:44:23 -0800 (PST)
From: "s3gmentationfault@gmail.com" <s3gmentationfault@gmail.com>
Message-ID: <dea15b8c-ab12-becd-88b5-3c8d20d1d36b@gmail.com>
Date: Wed, 15 Nov 2017 23:44:29 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
	Thunderbird/52.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Mailman-Approved-At: Wed, 15 Nov 2017 18:06:36 -0500
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#29311: Byte comparison from cmp diffutils
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, 15 Nov 2017 23:07:08 -0000

Hi, i write this message because cmp command from diffutils give an 
unexpected result if is used on binary files:
if we try to compare two different files (not symlink, not hardlink 
etc..), cmp say that the differ from 42 byte.

~ > LC_ALL=C cmp /usr/bin/g++ /usr/bin/gcc
/usr/bin/g++ /usr/bin/gcc differ: char 42, line 1

During a discussion another member convinced me to try hexdump for do 
that  comparison than i have see that those file differ for many bytes 
then 42, so i have try to write a program for do that, just for sure 
(the program is silly i have also forget to return EXIT_SUCCESS, and as 
default if it find a different byte the consider all other byte 
different but is only for this demonstration)
src: https://arin.ga/swsNn1


~ > CFLAGS=-O3 make diffbyte_gcc && ./diffbyte_gcc
they diff by: 766087 byte

so something absolutely does not work:
some clarifications: I have see just now that using C as language it say 
char, but in my language it say "byte" ("/bin/g++ /bin/gcc differenza: 
byte 42, riga 1").
However that is indifferent since in manpage it use only "byte" term, so 
i expect that it compare bytes, not only ascii text; The manpages at 
description say:  "Compare two files byte by byte".


For do other example, the wc command with -c option really counts the bytes:

~ > printf "\u2592"|wc -c
3

~ > printf "ciao\0x8" | wc -c
7


and (except for the sparse files) also du and wc report the same result 
with binary files:

~ > du -b /bin/gcc
993584  /bin/gcc

~ > wc -c /bin/gcc
993584 /bin/gcc


 From info i read:
The 'cmp' command compares two files, and if they differ, tells the 
first byte and line number where they differ or reports that one file is 
a prefix of the other.
Bytes and lines are numbered starting with 1. The arguments of 'cmp' are 
as follows:

I do not know if it is meant that the comparison stops at the first line 
or rather when one of the two buffers differs from the other but 
manpages and program options say that it compare byte
so it should do




From MAILER-DAEMON Wed Nov 15 19:15:07 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1eF7pj-0000De-KL
	for mharc-bug-diffutils@gnu.org; Wed, 15 Nov 2017 19:15:07 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47164)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eF7pi-0000DU-50
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 19:15:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eF7pe-0004R0-RJ
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 19:15:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:33637)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1eF7pe-0004Qp-O7
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 19:15:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eF7pe-0001Ui-FZ
	for bug-diffutils@gnu.org; Wed, 15 Nov 2017 19:15:02 -0500
X-Loop: help-debbugs@gnu.org
References: <dea15b8c-ab12-becd-88b5-3c8d20d1d36b@gmail.com>
In-Reply-To: <dea15b8c-ab12-becd-88b5-3c8d20d1d36b@gmail.com>
Resent-From: "s3gmentationfault@gmail.com" <s3gmentationfault@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Thu, 16 Nov 2017 00:15:02 +0000
Resent-Message-ID: <handler.29311.B29311.15107912545653@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 29311
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 29311@debbugs.gnu.org
Received: via spool by 29311-submit@debbugs.gnu.org id=B29311.15107912545653
	(code B ref 29311); Thu, 16 Nov 2017 00:15:02 +0000
Received: (at 29311) by debbugs.gnu.org; 16 Nov 2017 00:14:14 +0000
Received: from localhost ([127.0.0.1]:42317 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1eF7or-0001T7-Vk
	for submit@debbugs.gnu.org; Wed, 15 Nov 2017 19:14:14 -0500
Received: from mail-wm0-f68.google.com ([74.125.82.68]:42898)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <s3gmentationfault@gmail.com>) id 1eF73B-0006qK-1h
	for 29311@debbugs.gnu.org; Wed, 15 Nov 2017 18:24:57 -0500
Received: by mail-wm0-f68.google.com with SMTP id t139so6182900wmt.1
	for <29311@debbugs.gnu.org>; Wed, 15 Nov 2017 15:24:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; 
	h=to:from:subject:message-id:date:user-agent:mime-version
	:content-transfer-encoding:content-language;
	bh=99pA5y6lcqWWHf3Eodxp2Rm7c/WUHnljnngh4ekhBFg=;
	b=RTZGIrqakwTRJu5J+P+U2/aH8uiW+wfmmJoKY3fi4gOJZiFTK8sH8A4vefQLfqKYcX
	CkziFP6RRrCtLX1l2iV76qccxTtnbLN4TEbcXDAImnr9yXmR0WGanECqaubjzw4Vzy+K
	Ns70EgmH7Mz24Yoq3tLWKjBDiGAdPvJe8KrOYj2RJ+93o1YDYJ6+jdOXWfzoJcy/uRXQ
	OyfgQrI4FHfRG5I1tqYhWdbp0GBsunD/UsTIt7rHXVmWGaJYexOq0KGgHNnbFwj4k0xK
	3piqXldKWzGrVwR7Zk4q68SSLUUGj5g2lq3w3Sy405DcTw7x9OzXWfPS9OnBkZVYtIPl
	c7Vw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:to:from:subject:message-id:date:user-agent
	:mime-version:content-transfer-encoding:content-language;
	bh=99pA5y6lcqWWHf3Eodxp2Rm7c/WUHnljnngh4ekhBFg=;
	b=IJB55Dbw0NB1hq7u2bdJepSI2f/MvIZRXnJwrPsu6nBt2Lqr4IhSsKldRlrB3Fs1Nt
	/2kRZa2QEtHAQ2VMlTHm0rzo99LRxRbKCLg1UUsWcjtVqEh/AEcur/aFeWM4UCHl1CPg
	M3KDTEIJ0gIvOsX7NzGXY824IEg6hzDyks9+IbyvJvnXNKRY/p0JzaGgyp4Jb0XdsWDB
	1sUVue1RUda/FdmGvpljt9rMvh872cwD0SNBMnUd5uaYjX1qSoPRwAJDonj7Lyjq+YO4
	oRznem/wRSs6TnTD2OID0N0I1KSpKcTE3FlyWX7Pol09tIfbGoFErdAdvNam9fO1RZ6d
	+3Vg==
X-Gm-Message-State: AJaThX5QY6Xp07lgmhkgr4E9lBXYJkqI1i3fJeNsbG+xEq6tM1FKtet8
	mnf621KNeXYkPcZyYxZO/Ex33lYA
X-Google-Smtp-Source: AGs4zMa7RS6Ahtpl7Sao/Q93CyfTPe1Iau279RRSLgMiHJozz7y6cX/N6nIqZsVzBWfIlS8ikfWDjw==
X-Received: by 10.80.244.16 with SMTP id r16mr95537edm.26.1510788290839;
	Wed, 15 Nov 2017 15:24:50 -0800 (PST)
Received: from [192.168.1.14] ([151.41.10.36])
	by smtp.gmail.com with ESMTPSA id j8sm32177edh.55.2017.11.15.15.24.49
	for <29311@debbugs.gnu.org>
	(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Wed, 15 Nov 2017 15:24:50 -0800 (PST)
From: "s3gmentationfault@gmail.com" <s3gmentationfault@gmail.com>
Message-ID: <ab0d7896-b73c-e2d9-9675-2b38794e5615@gmail.com>
Date: Thu, 16 Nov 2017 00:24:57 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
	Thunderbird/52.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
X-Mailman-Approved-At: Wed, 15 Nov 2017 19:14:12 -0500
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#29311: Byte comparison from cmp diffutils
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: Thu, 16 Nov 2017 00:15:07 -0000

Hi, i write this message regarding to my previous bug report, i have see 
just now that posix section of manpages say:
"The cmp utility shall write no output files are the same. Under default 
options, if they differ, it  shall write tostandard  output the byte and 
line number at which the first difference occurred. Bytes and lines 
shall be numbered beginning with 1."

so now it's all clare.




From MAILER-DAEMON Thu Nov 30 08:55:10 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1eKPJ0-0005AK-SR
	for mharc-bug-diffutils@gnu.org; Thu, 30 Nov 2017 08:55:10 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43970)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eKPIy-00057Q-MM
	for bug-diffutils@gnu.org; Thu, 30 Nov 2017 08:55:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eKPIs-0006sk-Mu
	for bug-diffutils@gnu.org; Thu, 30 Nov 2017 08:55:08 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:57210)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1eKPIs-0006sZ-HW
	for bug-diffutils@gnu.org; Thu, 30 Nov 2017 08:55:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1eKPIs-0000c0-6y
	for bug-diffutils@gnu.org; Thu, 30 Nov 2017 08:55:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: =?UTF-8?Q?Llu=C3=ADs?= Batlle i Rossell <viric@viric.name>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Thu, 30 Nov 2017 13:55:02 +0000
Resent-Message-ID: <handler.29510.B.15120500992334@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 29510
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 29510@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.15120500992334
	(code B ref -1); Thu, 30 Nov 2017 13:55:02 +0000
Received: (at submit) by debbugs.gnu.org; 30 Nov 2017 13:54:59 +0000
Received: from localhost ([127.0.0.1]:37658 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1eKPIk-0000bV-JD
	for submit@debbugs.gnu.org; Thu, 30 Nov 2017 08:54:58 -0500
Received: from eggs.gnu.org ([208.118.235.92]:52914)
	by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from
	<4e01d929.AEMASbSfssgAAAAAAAAAAGyqGxEAARpcY_sAAAAAAAeRJgBaIA2O@bnc3.mailjet.com>)
	id 1eKPIh-0000bI-8d
	for submit@debbugs.gnu.org; Thu, 30 Nov 2017 08:54:51 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from
	<4e01d929.AEMASbSfssgAAAAAAAAAAGyqGxEAARpcY_sAAAAAAAeRJgBaIA2O@bnc3.mailjet.com>)
	id 1eKPIW-0006ZP-AB
	for submit@debbugs.gnu.org; Thu, 30 Nov 2017 08:54:46 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:37571)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from
	<4e01d929.AEMASbSfssgAAAAAAAAAAGyqGxEAARpcY_sAAAAAAAeRJgBaIA2O@bnc3.mailjet.com>)
	id 1eKPIW-0006ZH-67
	for submit@debbugs.gnu.org; Thu, 30 Nov 2017 08:54:40 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43880)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from
	<4e01d929.AEMASbSfssgAAAAAAAAAAGyqGxEAARpcY_sAAAAAAAeRJgBaIA2O@bnc3.mailjet.com>)
	id 1eKPIU-00055N-Km
	for bug-diffutils@gnu.org; Thu, 30 Nov 2017 08:54:39 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from
	<4e01d929.AEMASbSfssgAAAAAAAAAAGyqGxEAARpcY_sAAAAAAAeRJgBaIA2O@bnc3.mailjet.com>)
	id 1eKPIO-0006Vs-QD
	for bug-diffutils@gnu.org; Thu, 30 Nov 2017 08:54:38 -0500
Received: from o174.p8.mailjet.com ([87.253.233.174]:43971)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from
	<4e01d929.AEMASbSfssgAAAAAAAAAAGyqGxEAARpcY_sAAAAAAAeRJgBaIA2O@bnc3.mailjet.com>)
	id 1eKPIO-0006Uy-Ec
	for bug-diffutils@gnu.org; Thu, 30 Nov 2017 08:54:32 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; q=dns/txt;
	d=viric.name; i=viric@viric.name; s=mailjet;
	h=message-id:mime-version:from:to:subject:date:list-unsubscribe:x-accept-language:
	x-csa-complaints:x-mj-mid:content-type:content-disposition:content-transfer-encoding;
	bh=3tUhwmixU1g7WJXmhQnQVjBsmcN5IL8XsOgJNUK8om8=;
	b=iZXm6KhTu8m8FZ9W4+LCz9Nh+a9vteY5Iam2MF/+RdG1QLqiAfloam6Z3
	Emymua/LvGxv04dTUl4OrETP0S3BVG3TvZOPccbLsM/4dWhxOnCegXTt01a+
	hiCt1lwmhvLoIGEIhU59iT+4ttrpHqy7JR8SmyVX2pQPU1Pb943vqk=
Message-Id: <4e01d929.AEMASbSfssgAAAAAAAAAAGyqGxEAARpcY_sAAAAAAAeRJgBaIA2O@mailjet.com>
MIME-Version: 1.0
From: =?UTF-8?Q?Llu=C3=ADs?= Batlle i Rossell <viric@viric.name>
Date: Thu, 30 Nov 2017 14:54:21 +0100
X-Accept-Language: ca, es, eo, ru, en, jbo, tokipona
X-CSA-Complaints: whitelist-complaints@eco.de
X-MJ-Mid: AEMASbSfssgAAAAAAAAAAGyqGxEAARpcY_sAAAAAAAeRJgBaIA2Opu1yhLSMRC60kfPLGkG6oAAHNTE
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
	[fuzzy]
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#29510: 3-way merge, diff3 lacking features
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: Thu, 30 Nov 2017 13:55:10 -0000

Hello,

I've been using diff3 to do 3-way merges... and I failed to make it work
as I wanted, with properly bracketed conflicts. "git merge-file" works
much better. I wrote a summary where you can see how "git merge-file"
works better, only annotating the conflicting parts with full detail.
diff3 either brackets too much or it misses details.

Maybe I just fail to know how to operate diff3; please let me know.

Here goes the summary; "-----" lines means nonexistant. It is a screen ca=
pture
of vimdiff.

(web version: http://sprunge.us/hBjJ)

Source:

		 local.c                    base.c                   remote.c

  #include <stdio.h>      |  #include <stdio.h>      |  #include <stdio.h=
>
  ------------------------|  #include <stdlib.h>     |  -----------------=
-------
                          |                          |
  int main()              |  int main()              |  int main()
  {                       |  {                       |  {
      echo 2;             |  ------------------------|      echo 1;
  }                       |  }                       |  }
  ------------------------|  ------------------------|
  ------------------------|  ------------------------|
  ------------------------|  ------------------------|
  ------------------------|  ------------------------|  #include <hola.h>


diff3 -m local.c base.c remote.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
#include <stdio.h>
<<<<<<< base.c
#include <stdlib.h>
=3D=3D=3D=3D=3D=3D=3D
>>>>>>> remote.c

int main()
{
<<<<<<< local.c
    echo 2;
||||||| base.c
=3D=3D=3D=3D=3D=3D=3D
    echo 1;
>>>>>>> remote.c
}



#include <hola.h>
------------------------------------------------------------

diff3 -3 -m local.c base.c remote.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
#include <stdio.h>

int main()
{
    echo 2;
}



#include <hola.h>

------------------------------------------------------------

diff3 -x -m local.c base.c remote.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
#include <stdio.h>

int main()
{
    echo 1;
}
------------------------------------------------------------

diff3 -X -m local.c base.c remote.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
#include <stdio.h>

int main()
{
<<<<<<< local.c
    echo 2;
=3D=3D=3D=3D=3D=3D=3D
    echo 1;
>>>>>>> remote.c
}
------------------------------------------------------------

git merge-file -p local.c base.c remote.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
#include <stdio.h>

int main()
{
<<<<<<< local.c
    echo 2;
||||||| base.c
=3D=3D=3D=3D=3D=3D=3D
    echo 1;
>>>>>>> remote.c
}
------------------------------------------------------------

man diff3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
       -e, --ed
              output ed script incorporating changes from OLDFILE to  YOU=
RFILE
              into MYFILE

       -E, --show-overlap
              like -e, but bracket conflicts

       -3, --easy-only
              like -e, but incorporate only nonoverlapping changes

       -x, --overlap-only
              like -e, but incorporate only overlapping changes

       -X     like -x, but bracket conflicts

       -i     append `w' and `q' commands to ed scripts

       -m, --merge
              output  actual  merged file, according to -A if no other op=
tions
              are given
------------------------------------------------------------


Regards,
Llu=EDs.

--=20
(Escriu-me xifrat si saps PGP / Write ciphered if you know PGP)
PGP key 7CBD1DA5 - https://emailselfdefense.fsf.org/




