diff -r d13913355390 -r bfeaa88b875d mercurial/patch.py
--- a/mercurial/patch.py	Wed Apr 20 19:54:57 2011 +0200
+++ b/mercurial/patch.py	Wed Apr 20 21:41:41 2011 +0200
@@ -21,7 +21,8 @@
 # helper functions
 
 def copyfile(src, dst, basedir):
-    abssrc, absdst = [util.canonpath(basedir, basedir, x) for x in [src, dst]]
+    abssrc, absdst = [scmutil.canonpath(basedir, basedir, x)
+                        for x in [src, dst]]
     if os.path.lexists(absdst):
         raise util.Abort(_("cannot create %s: destination already exists") %
                          dst)