Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/exchange.py
branchstable
changeset 23975 3b7088a5c64c
parent 23890 7817059917d0
child 24638 13a19717ade6 
--- a/mercurial/exchange.py	Fri Jan 30 21:40:30 2015 +0000
+++ b/mercurial/exchange.py	Fri Jan 30 21:11:02 2015 +0000
@@ -946,8 +946,9 @@
         scommon = set(common)
         filteredrheads = []
         for n in rheads:
-            if n in nm and n not in scommon:
-                common.append(n)
+            if n in nm:
+                if n not in scommon:
+                    common.append(n)
             else:
                 filteredrheads.append(n)
         if not filteredrheads:
Mercurial