Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 3925:27230c29bfec 0.9.3
fix calculation of new heads added during push with -r
fix issue450
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 17 Dec 2006 05:00:22 +0100 |
| parents | 46abbed02b2d |
| children | 4df475e22248 e7282dede8cd |
comparison
equal
deleted
inserted
replaced
| 3918:5f0e00224cde | 3925: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) |