# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 2012-04-13 11:35:45
# Node ID 432f198600c6a4f9af1016c4c4045a1617063ff8
# Parent  9e02e032b5229c716b516568f35980c616217861

revset: make matching keyword not match summary when matching for description

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -945,6 +945,9 @@ def matching(repo, subset, x):
                 field = 'user'
             fields.append(field)
     fields = set(fields)
+    if 'summary' in fields and 'description' in fields:
+        # If a revision matches its description it also matches its summary
+        fields.discard('summary')
 
     # We may want to match more than one field
     # Each field will be matched with its own "getfield" function