Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
84:b2e3528115da 85:58a1a0425c9b
690 l = remote.between([(n[0], n[1])])[0] 690 l = remote.between([(n[0], n[1])])[0]
691 p = n[0] 691 p = n[0]
692 f = 1 692 f = 1
693 for i in l + [n[1]]: 693 for i in l + [n[1]]:
694 if i in m: 694 if i in m:
695 if f <= 4: 695 if f <= 2:
696 self.ui.debug("found new branch changeset %s\n" % 696 self.ui.debug("found new branch changeset %s\n" %
697 short(p)) 697 short(p))
698 fetch.append(p) 698 fetch.append(p)
699 else: 699 else:
700 self.ui.debug("narrowed branch search to %s:%s\n" 700 self.ui.debug("narrowed branch search to %s:%s\n"