Show More
@@ -435,11 +435,11 def analyzeremotephases(repo, subset, ro | |||||
435 | continue |
|
435 | continue | |
436 | node = bin(nhex) |
|
436 | node = bin(nhex) | |
437 | phase = int(phase) |
|
437 | phase = int(phase) | |
438 |
if phase == |
|
438 | if phase == public: | |
439 | if node != nullid: |
|
439 | if node != nullid: | |
440 | repo.ui.warn(_('ignoring inconsistent public root' |
|
440 | repo.ui.warn(_('ignoring inconsistent public root' | |
441 | ' from remote: %s\n') % nhex) |
|
441 | ' from remote: %s\n') % nhex) | |
442 |
elif phase == |
|
442 | elif phase == draft: | |
443 | if node in nodemap: |
|
443 | if node in nodemap: | |
444 | draftroots.append(node) |
|
444 | draftroots.append(node) | |
445 | else: |
|
445 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now