--- a/mercurial/phases.py	Wed Jan 20 22:10:17 2016 -0500
+++ b/mercurial/phases.py	Mon Feb 15 16:49:52 2016 -0800
@@ -435,11 +435,11 @@
             continue
         node = bin(nhex)
         phase = int(phase)
-        if phase == 0:
+        if phase == public:
             if node != nullid:
                 repo.ui.warn(_('ignoring inconsistent public root'
                                ' from remote: %s\n') % nhex)
-        elif phase == 1:
+        elif phase == draft:
             if node in nodemap:
                 draftroots.append(node)
         else: