equal
deleted
inserted
replaced
1282 warn = 1 |
1282 warn = 1 |
1283 else: |
1283 else: |
1284 newheads = list(heads) |
1284 newheads = list(heads) |
1285 for r in remote_heads: |
1285 for r in remote_heads: |
1286 if r in self.changelog.nodemap: |
1286 if r in self.changelog.nodemap: |
1287 desc = self.changelog.heads(r) |
1287 desc = self.changelog.heads(r, heads) |
1288 l = [h for h in heads if h in desc] |
1288 l = [h for h in heads if h in desc] |
1289 if not l: |
1289 if not l: |
1290 newheads.append(r) |
1290 newheads.append(r) |
1291 else: |
1291 else: |
1292 newheads.append(r) |
1292 newheads.append(r) |