From owner-svn-src-stable@freebsd.org  Sun Nov  8 17:10:13 2020
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 6CA43466721;
 Sun,  8 Nov 2020 17:10:13 +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 4CTgc52fn7z3td5;
 Sun,  8 Nov 2020 17:10:13 +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 4E10A2338E;
 Sun,  8 Nov 2020 17:10:13 +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 0A8HADSU085994;
 Sun, 8 Nov 2020 17:10:13 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A8HADRR085993;
 Sun, 8 Nov 2020 17:10:13 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <202011081710.0A8HADRR085993@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, 8 Nov 2020 17:10:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r367489 - stable/12/usr.sbin/mergemaster
X-SVN-Group: stable-12
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/12/usr.sbin/mergemaster
X-SVN-Commit-Revision: 367489
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Nov 2020 17:10:13 -0000

Author: emaste
Date: Sun Nov  8 17:10:12 2020
New Revision: 367489
URL: https://svnweb.freebsd.org/changeset/base/367489

Log:
  MFC r367042: 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

Modified:
  stable/12/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/12/usr.sbin/mergemaster/mergemaster.sh	Sun Nov  8 15:54:59 2020	(r367488)
+++ stable/12/usr.sbin/mergemaster/mergemaster.sh	Sun Nov  8 17:10:12 2020	(r367489)
@@ -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}