From owner-freebsd-bugs@freebsd.org Sat Oct 3 20:08:36 2020 Return-Path: Delivered-To: freebsd-bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 37CA04372DC for ; Sat, 3 Oct 2020 20:08:36 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4C3dGX0nQVz3XJR for ; Sat, 3 Oct 2020 20:08:36 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 1AE8443724F; Sat, 3 Oct 2020 20:08:36 +0000 (UTC) Delivered-To: bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1AB0B4372DB for ; Sat, 3 Oct 2020 20:08:36 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C3dGW73mSz3X1y for ; Sat, 3 Oct 2020 20:08:35 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D751F186E7 for ; Sat, 3 Oct 2020 20:08:35 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 093K8ZUp052529 for ; Sat, 3 Oct 2020 20:08:35 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 093K8Z9R052528 for bugs@FreeBSD.org; Sat, 3 Oct 2020 20:08:35 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 250015] diff -purw fails with 'error: conflicting output format options.' Date: Sat, 03 Oct 2020 20:08:35 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: kevans@freebsd.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: cc Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Oct 2020 20:08:36 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D250015 Kyle Evans changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bapt@FreeBSD.org --- Comment #1 from Kyle Evans --- (In reply to Ed Maste from comment #0) Hmm... this is unfortunate. -p sets the format to context, which is incompatible with -u. I note that the following is what GNU diff appears to= do: kevans91:~/grep$ diff -p A B *** A 2020-10-03 15:02:53.072790765 -0500 --- B 2020-10-03 15:03:00.652785502 -0500 *************** *** 1,7 **** A B ! C ! D E F G --- 1,7 ---- A B ! X ! Y E F G kevans91:~/grep$ diff -pu A B --- A 2020-10-03 15:02:53.072790765 -0500 +++ B 2020-10-03 15:03:00.652785502 -0500 @@ -1,7 +1,7 @@ A B -C -D +X +Y E F G kevans91:~/grep$ diff -up A B --- A 2020-10-03 15:02:53.072790765 -0500 +++ B 2020-10-03 15:03:00.652785502 -0500 @@ -1,7 +1,7 @@ A B -C -D +X +Y E F G I suspect the answer here is that we should leave the diff_format as D_UNSE= T, then after all option processing default it to D_CONTEXT if it's still unset and D_PROTOTYPE is set. CC'ing bapt@ to get a second opinion. I also note that GNU diff doesn't appear to check the format at all for -p,= so we should probably stop that as well: kevans91:~/grep$ diff -qp A B Files A and B differ kevans91:~/grep$ diff -pq A B Files A and B differ --=20 You are receiving this mail because: You are the assignee for the bug.=