equal
deleted
inserted
replaced
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) |