--- a/mercurial/copies.py	Tue Jun 03 09:34:14 2008 +0200
+++ b/mercurial/copies.py	Tue Jun 03 15:41:09 2008 -0500
@@ -109,6 +109,10 @@
     if not c1 or not c2 or c1 == c2:
         return {}, {}
 
+    # avoid silly behavior for parent -> working dir
+    if c2.node() == None and c1.node() == repo.dirstate.parents()[0]:
+        return repo.dirstate.copies(), {}
+
     limit = _findlimit(repo, c1.rev(), c2.rev())
     m1 = c1.manifest()
     m2 = c2.manifest()