--- a/mercurial/windows.py	Wed Jan 05 15:56:03 2011 +0100
+++ b/mercurial/windows.py	Sun Jan 02 19:34:41 2011 +0100
@@ -276,7 +276,7 @@
             break
         head, tail = os.path.split(head)
 
-def unlink(f):
+def unlinkpath(f):
     """unlink and remove the directory if it is empty"""
     os.unlink(f)
     # try removing directories that might now be empty