From owner-svn-src-all@freebsd.org Tue Apr 28 12:43:00 2020 Return-Path: Delivered-To: svn-src-all@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 32A822B86DA; Tue, 28 Apr 2020 12:43:00 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49BLsJ09Mhz4g1X; Tue, 28 Apr 2020 12:42:59 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: by mail-wm1-x343.google.com with SMTP id r26so2716902wmh.0; Tue, 28 Apr 2020 05:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=+AGVnDbmsgROvhJymkcfikIqQmonKbKjKB5hiAYmdUo=; b=FZaM2RyxRx7vj+a+IGmZjUsGvx8bQ3CRwgLQCnmkGSf+4pe3EL+0A+VAw1GC1Ij8dY W90r2SWQoYZdWjMfawJ52B517VzN81pJ2khuILSUfoVPqeAODZzHYHYbgC2htjKXZ/Bg up8LEq4S2KDx89HhxdWqgaWLMjjfQEsFZDFSpOyPTQCMWmbGyuUp5r5P2diX8fv7+QhU bTNvXpunHb/F8BZvJDPKwPN24mhlGwCPQoRoL2PFsEUNX0p2RisMPjcGF5tUuYb8TzGB h5JImHCcWMMqLPE/1uEHWlWvCQkUVCubIFHTorC3FXS91vvHa6UOlPLXO6BmzqX5yspQ dTYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=+AGVnDbmsgROvhJymkcfikIqQmonKbKjKB5hiAYmdUo=; b=SDf+5y7BEJ57G1Uwpru2Upo/yDH//NqJ00WCu+cIRLYeUqnIAwu2OXi5eR7RKjTUaK zCoDAp6RdQ7YZR91p/zR6AVi4UtMqIN+/ez5pC+86K6BN4MkKQzPjDqkx7MW9r75ad9y XV+HMXiO4L/UKNxBuwrTOQDnLq2EPjvy97pRnDoHpqGx/fmEDJ35zBLaESRjKU0NDOxi WWFnlFzYTieZzPX/OKCJ1wuwBwDy9hp2+eu2Iy1OS1+VW2599m03PgjR3uVPDMEUoUp+ z0rhSpM2W7EdNGBks/Qmc1RMhe7mNsk/rukWhdG505nTiJtCx6JbULE/+r0NwzDsUmJr xOBQ== X-Gm-Message-State: AGi0PuYYcWfcaJcQYhDogfqYcSWX1Me6EcchDmE3Y7QrL9wyjJPmej9K 0tl7qHaAroKSX76L4/P1bAYrQvmT X-Google-Smtp-Source: APiQypLjxDTGH8u6zjcTHP/pE7KF3F+PXmkzpH3HRUvMTaRyVwcPARPPFlvsorixgXkGcsn7rFtUvg== X-Received: by 2002:a1c:bb08:: with SMTP id l8mr4865515wmf.168.1588077778053; Tue, 28 Apr 2020 05:42:58 -0700 (PDT) Received: from ernst.home (p5B3BE186.dip0.t-ipconnect.de. [91.59.225.134]) by smtp.gmail.com with ESMTPSA id w10sm26477778wrg.52.2020.04.28.05.42.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 05:42:57 -0700 (PDT) Date: Tue, 28 Apr 2020 14:42:55 +0200 From: Gary Jennejohn To: Kyle Evans Cc: Jan Beich , svn-src-head , svn-src-all , src-committers Subject: Re: svn commit: r360125 - in head/usr.bin/diff: . tests Message-ID: <20200428144255.1b75d9b5@ernst.home> In-Reply-To: References: <202004201614.03KGEitC073880@repo.freebsd.org> Reply-To: gljennjohn@gmail.com X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49BLsJ09Mhz4g1X X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.995,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2020 12:43:00 -0000 On Tue, 28 Apr 2020 07:25:18 -0500 Kyle Evans wrote: > On Tue, Apr 28, 2020 at 6:52 AM Jan Beich wrote: > > > > Kyle Evans writes: > > > > > Author: kevans > > > Date: Mon Apr 20 16:14:44 2020 > > > New Revision: 360125 > > > URL: https://svnweb.freebsd.org/changeset/base/360125 > > > > > > Log: > > > diff(1): reject conflicting formatting options > > > > > > This matches GNU diff(1) behavior and, more importantly, eliminates any > > > source of confusion if multiple formatting options are specified. > > > > > > Note that the committed diff differs slightly from the submitted: I've > > > modified it so that we initialize diff_format to something that isn't an > > > accepted format option so that we can also reject --normal -c and -c > > > --normal, which would've otherwise been accepted because the default was > > > --normal. After option parsing we default it to D_NORMAL if it's still > > > unset. > > > > > > PR: 243975 > > > Submitted by: fehmi noyan isi > > > MFC after: 1 week > > > > Appears to break ability to specify number of context lines e.g., > > > > $ diff -U999 /usr/include/sha256.h /usr/include/sha512.h > > error: conflicting output format options. > > usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case] > > [...] > > Hmm, bizarre. =-\ This example works on my machine, and I don't see > off-hand what would be preventing it for you: > > root@viper:/usr/src/usr.bin/diff# diff -U999 /usr/include/sha256.h > /usr/include/sha512.h > --- /usr/include/sha256.h 2020-04-22 21:38:54.000000000 -0500 > +++ /usr/include/sha512.h 2020-04-22 21:38:54.000000000 -0500 > @@ -1,99 +1,99 @@ > /*- > * Copyright 2005 Colin Percival > * All rights reserved. > * > [... omitted ...] > > root@viper:/usr/src/usr.bin/diff# strings /usr/bin/diff | grep 'conflicting' > error: conflicting output format options. > My /usr/bin/diff was built and installed on April 26, after this commit, and I don't see the error either. -- Gary Jennejohn