# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1187186944 -7200
# Node ID 64888ff907f41e89818f58448d09323031329d63
# Parent  7706ff46ef4590ac802c9896071c7954bd421957
Fix issue 685: trackback in grep -r after rename

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1204,9 +1204,9 @@ def grep(ui, repo, pattern, *pats, **opt
             for fn in fns:
                 if fn in skip:
                     continue
-                fstate.setdefault(fn, {})
                 try:
                     grepbody(fn, rev, getfile(fn).read(mf[fn]))
+                    fstate.setdefault(fn, [])
                     if follow:
                         copied = getfile(fn).renamed(mf[fn])
                         if copied: