Bug 249214 - mergemaster: The message about "Displaying differences between" is in reverse order
Summary: mergemaster: The message about "Displaying differences between" is in reverse...
Status: New
Alias: None
Product: Base System
Classification: Unclassified
Component: misc (show other bugs)
Version: 12.1-STABLE
Hardware: Any Any
: --- Affects Only Me
Assignee: Ed Maste
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-09-09 15:25 UTC by Yuri Victorovich
Modified: 2020-10-25 18:07 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Yuri Victorovich freebsd_committer 2020-09-09 15:25:12 UTC
The 'mergemaster' command printed this:
>   *** Displaying differences between ./.cshrc and installed version:
> 
> --- /.cshrc     2019-05-14 00:56:47.216325000 -0700
> +++ ./.cshrc    2020-09-09 08:16:49.515840000 -0700

The diff is between the installed version (/.cshrc) and the new version (./.cshrc). The message from mergemaster is in reverse.

It should say:
>   *** Displaying differences between installed version and ./.cshrc:

The way it is now is incorrect and causes confusion.
Comment 1 commit-hook freebsd_committer 2020-10-25 18:07:17 UTC
A commit references this bug:

Author: emaste
Date: Sun Oct 25 18:06:45 UTC 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

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