diff -r b1c344ebd8e4 -r a192fff6c97d mercurial/context.py
--- a/mercurial/context.py	Sun Aug 11 22:51:18 2013 -0500
+++ b/mercurial/context.py	Sun Aug 11 22:51:30 2013 -0500
@@ -485,6 +485,8 @@
         return self._changectx.flags(self._path)
     def filelog(self):
         return self._filelog
+    def rev(self):
+        return self._changeid
 
 class filectx(basefilectx):
     """A filecontext object makes access to data related to a particular
@@ -541,8 +543,6 @@
         return filectx(self._repo, self._path, fileid=fileid,
                        filelog=self._filelog)
 
-    def rev(self):
-        return self._changeid
     def linkrev(self):
         return self._filelog.linkrev(self._filerev)
     def node(self):