Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge bug, I hope
authormpm@selenic.com
Tue, 17 May 2005 11:40:45 -0800
changeset 85 58a1a0425c9b
parent 84 b2e3528115da
child 86 1b945e8ba67b
Fix merge bug, I hope
mercurial/hg.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hg.py	Tue May 17 11:40:26 2005 -0800
+++ b/mercurial/hg.py	Tue May 17 11:40:45 2005 -0800
@@ -692,7 +692,7 @@
             f = 1
             for i in l + [n[1]]:
                 if i in m:
-                    if f <= 4:
+                    if f <= 2:
                         self.ui.debug("found new branch changeset %s\n" %
                                           short(p))
                         fetch.append(p)
Mercurial