# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1164975069 -3600
# Node ID a095c13c173c6696c256a139ef20f93facc7d643
# Parent  68cddfbbe737f15cdea61196aa910316a627a2f0# Parent  d626fc9e3985821d622e089a0e14f7ef922e3046
merge with upstream

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -355,14 +355,14 @@ class revlog(object):
         fmt = v & 0xFFFF
         if fmt == REVLOGV0:
             if flags:
-                raise RevlogError(_("index %s invalid flags %x for format v0")
+                raise RevlogError(_("index %s unknown flags %x for format v0")
                                   % (self.indexfile, flags))
         elif fmt == REVLOGNG:
             if flags & ~REVLOGNGINLINEDATA:
-                raise RevlogError(_("index %s invalid flags %x for revlogng")
+                raise RevlogError(_("index %s unknown flags %x for revlogng")
                                   % (self.indexfile, flags))
         else:
-            raise RevlogError(_("index %s invalid format %d")
+            raise RevlogError(_("index %s unknown format %d")
                               % (self.indexfile, fmt))
         self.version = v
         if v == REVLOGV0:
diff --git a/mercurial/verify.py b/mercurial/verify.py
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -179,6 +179,18 @@ def verify(repo):
                         (f, short(n), short(p1)))
             nodes[n] = 1
 
+            # check renames
+            try:
+                rp = fl.renamed(n)
+                if rp:
+                    fl2 = repo.file(rp[0])
+                    rev = fl2.rev(rp[1])
+            except KeyboardInterrupt:
+                repo.ui.warn(_("interrupted"))
+                raise
+            except Exception, inst:
+                err(_("checking rename on file %s %s: %s") % (f, short(n), inst))
+
         # cross-check
         for node in filenodes[f]:
             err(_("node %s in manifests not in %s") % (hex(node), f))