diff -r ba45041827a2 -r 2308c39b9521 mercurial/context.py
--- a/mercurial/context.py	Mon Dec 25 13:37:00 2006 +0100
+++ b/mercurial/context.py	Mon Dec 25 17:43:44 2006 +0100
@@ -125,16 +125,18 @@
         self._repo = repo
         self._path = path
 
-        assert changeid is not None or fileid is not None
+        assert (changeid is not None
+                or fileid is not None
+                or changectx is not None)
 
         if filelog:
             self._filelog = filelog
-        if changectx:
-            self._changectx = changectx
-            self._changeid = changectx.node()
 
         if fileid is None:
-            self._changeid = changeid
+            if changectx is None:
+                self._changeid = changeid
+            else:
+                self._changectx = changectx
         else:
             self._fileid = fileid