Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/hg.py @ 85:58a1a0425c9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge bug, I hope
author mpm@selenic.com
date Tue, 17 May 2005 11:40:45 -0800
parents 9fd5b35cfc45
children ab9ebff09dcd
line wrap: on
line diff
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -692,7 +692,7 @@ class localrepository:
             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)