From patchwork Tue Apr 30 06:46:16 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: help: suggest merge() revset instead of -m/--only-merges
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 39907
Message-Id: <c80e35b4d31e1e711cdc.1556606776@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Tue, 30 Apr 2019 15:46:16 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1556605323 -32400
#      Tue Apr 30 15:22:03 2019 +0900
# Node ID c80e35b4d31e1e711cdc8c3db1447b1967f11445
# Parent  4ee38eceffa9ed735e59cb48324c1a4edcab9d3e
help: suggest merge() revset instead of -m/--only-merges

Suggested by Dr Rainer Woitok.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3718,7 +3718,8 @@ def locate(ui, repo, *pats, **opts):
      _('follow line range of specified file (EXPERIMENTAL)'),
      _('FILE,RANGE')),
     ('', 'removed', None, _('include revisions where files were removed')),
-    ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
+    ('m', 'only-merges', None,
+     _('show only merges (DEPRECATED) (use -r "merge()" instead)')),
     ('u', 'user', [], _('revisions committed by user'), _('USER')),
     ('', 'only-branch', [],
      _('show only changesets within the given named branch (DEPRECATED)'),