changeset 570:a24c2f90a3dd

Merge obsolete marker fix.
author Augie Fackler <raf@durin42.com>
date Mon, 29 Oct 2012 21:34:37 -0500
parents 92aa31a3a1dd (current diff) 41f6e3df67b1 (diff)
children a9165a7d8082
files hggit/overlay.py
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/overlay.py
+++ b/hggit/overlay.py
@@ -151,6 +151,13 @@
     def __nonzero__(self):
         return True
 
+    def phase(self):
+        try:
+            from mercurial import phases
+            return phases.draft
+        except ImportError:
+            return 1
+
 class overlayrevlog(object):
     def __init__(self, repo, base):
         self.repo = repo