--- a/mercurial/revset.py	Thu Mar 22 21:12:15 2012 +0100
+++ b/mercurial/revset.py	Fri Apr 13 13:35:45 2012 +0200
@@ -945,6 +945,9 @@
                 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