--- a/mercurial/context.py	Wed Aug 14 13:41:09 2013 -0500
+++ b/mercurial/context.py	Thu Aug 15 13:31:17 2013 -0500
@@ -456,7 +456,7 @@
             return False
 
     def __str__(self):
-        return "%s@%s" % (self.path(), short(self.node()))
+        return "%s@%s" % (self.path(), self._changectx)
 
     def __repr__(self):
         return "<%s %s>" % (type(self).__name__, str(self))