--- a/tests/test-grep	Wed Aug 15 16:09:04 2007 +0200
+++ b/tests/test-grep	Wed Aug 15 16:18:40 2007 +0200
@@ -52,3 +52,17 @@
 hg ci -m 3 -d '0 0'
 hg grep orange
 hg grep --all orange
+
+# Got a traceback when using grep on a single
+# revision with renamed files.
+cd ..
+echo % issue 685
+hg init issue685
+cd issue685
+echo octarine > color
+hg ci -Amcolor
+hg rename color colour
+Hg ci -Am rename
+hg grep octarine
+# Used to crash here
+hg grep -r 1 octarine

--- a/tests/test-grep.out	Wed Aug 15 16:09:04 2007 +0200
+++ b/tests/test-grep.out	Wed Aug 15 16:18:40 2007 +0200
@@ -32,3 +32,8 @@
 color:3:+:orange
 color:2:-:orange
 color:1:+:orange
+% issue 685
+adding color
+color:0:octarine
+colour:1:octarine
+colour:1:octarine