mercurial/hbisect.py
changeset 44452 9d2b2df2c2ba
parent 43665 f37da59a36d9
child 45875 e641bb2a6159
equal deleted inserted replaced
44449:ff72bd52d56a 44452:9d2b2df2c2ba
   135     if len(parents) > 1:
   135     if len(parents) > 1:
   136         if good:
   136         if good:
   137             side = state[b'bad']
   137             side = state[b'bad']
   138         else:
   138         else:
   139             side = state[b'good']
   139             side = state[b'good']
   140         num = len(set(i.node() for i in parents) & set(side))
   140         num = len({i.node() for i in parents} & set(side))
   141         if num == 1:
   141         if num == 1:
   142             return parents[0].ancestor(parents[1])
   142             return parents[0].ancestor(parents[1])
   143     return None
   143     return None
   144 
   144 
   145 
   145