mercurial/localrepo.py
changeset 3923 27230c29bfec
parent 3862 46abbed02b2d
child 3928 4df475e22248
child 4058 e7282dede8cd
equal deleted inserted replaced
3919:5f0e00224cde 3923:27230c29bfec
  1390                 warn = 1
  1390                 warn = 1
  1391             else:
  1391             else:
  1392                 newheads = list(heads)
  1392                 newheads = list(heads)
  1393                 for r in remote_heads:
  1393                 for r in remote_heads:
  1394                     if r in self.changelog.nodemap:
  1394                     if r in self.changelog.nodemap:
  1395                         desc = self.changelog.heads(r)
  1395                         desc = self.changelog.heads(r, heads)
  1396                         l = [h for h in heads if h in desc]
  1396                         l = [h for h in heads if h in desc]
  1397                         if not l:
  1397                         if not l:
  1398                             newheads.append(r)
  1398                             newheads.append(r)
  1399                     else:
  1399                     else:
  1400                         newheads.append(r)
  1400                         newheads.append(r)