From owner-svn-src-all@freebsd.org  Sun Oct 25 18:06:45 2020
Return-Path: <owner-svn-src-all@freebsd.org>
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 F23D4454E4A;
 Sun, 25 Oct 2020 18:06:45 +0000 (UTC)
 (envelope-from emaste@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 4CK5Wn5q3yz4MJr;
 Sun, 25 Oct 2020 18:06:45 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABFB7D9AB;
 Sun, 25 Oct 2020 18:06:45 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09PI6jOH049727;
 Sun, 25 Oct 2020 18:06:45 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09PI6jUE049726;
 Sun, 25 Oct 2020 18:06:45 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <202010251806.09PI6jUE049726@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 25 Oct 2020 18:06:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r367042 - head/usr.sbin/mergemaster
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/usr.sbin/mergemaster
X-SVN-Commit-Revision: 367042
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Oct 2020 18:06:46 -0000

Author: emaste
Date: Sun Oct 25 18:06:45 2020
New Revision: 367042
URL: https://svnweb.freebsd.org/changeset/base/367042

Log:
  mergemaster: Clarify installed and updated versions
  
  Describe "diff installed new" as "Displaying differences between
  installed and new."  Previously mergemaster described them in the
  opposite order.
  
  PR:		249214
  Reported by:	Yuri Victorovich
  MFC after:	2 weeks

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Sun Oct 25 16:58:48 2020	(r367041)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Sun Oct 25 18:06:45 2020	(r367042)
@@ -143,7 +143,7 @@ diff_loop () {
 	echo '   ======================================================================   '
 	echo ''
         (
-          echo "  *** Displaying differences between ${COMPFILE} and installed version:"
+          echo "  *** Displaying differences between installed version and ${COMPFILE}:"
           echo ''
           diff ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}"
         ) | ${PAGER}