hgext/largefiles/overrides.py
branchstable
changeset 17245 6e84171a61c8
parent 17232 25248e2ebaee
child 17263 c4ebdc36c17e
--- a/hgext/largefiles/overrides.py	Wed Jul 25 16:15:28 2012 +0900
+++ b/hgext/largefiles/overrides.py	Sun Jul 22 23:37:53 2012 -0400
@@ -515,14 +515,16 @@
                     dest.startswith(repo.wjoin(lfutil.shortname))):
                     srclfile = src.replace(repo.wjoin(lfutil.standin('')), '')
                     destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '')
-                    destlfiledir = os.path.dirname(destlfile) or '.'
+                    destlfiledir = os.path.dirname(repo.wjoin(destlfile)) or '.'
                     if not os.path.isdir(destlfiledir):
                         os.makedirs(destlfiledir)
                     if rename:
                         os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile))
                         lfdirstate.remove(srclfile)
                     else:
-                        util.copyfile(srclfile, destlfile)
+                        util.copyfile(repo.wjoin(srclfile),
+                                      repo.wjoin(destlfile))
+
                     lfdirstate.add(destlfile)
             lfdirstate.write()
         except util.Abort, e: