equal
deleted
inserted
replaced
274 continue |
274 continue |
275 node = bin(nhex) |
275 node = bin(nhex) |
276 phase = int(phase) |
276 phase = int(phase) |
277 if phase == 0: |
277 if phase == 0: |
278 if node != nullid: |
278 if node != nullid: |
279 msg = _('ignoring inconsistense public root from remote: %s') |
279 msg = _('ignoring inconsistent public root from remote: %s') |
280 repo.ui.warn(msg, nhex) |
280 repo.ui.warn(msg, nhex) |
281 elif phase == 1: |
281 elif phase == 1: |
282 if node in nodemap: |
282 if node in nodemap: |
283 draftroots.append(node) |
283 draftroots.append(node) |
284 else: |
284 else: |