Date: Sun, 8 Nov 2020 17:10:13 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> 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 Message-ID: <202011081710.0A8HADRR085993@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011081710.0A8HADRR085993>