Changeset 51fd1adb08d1…
Parent 119729bc2d66…
by
Changes to one file · Browse files at 51fd1adb08d1 Showing diff from parent 119729bc2d66 Diff from another changeset...
@@ -455,9 +455,6 @@ # 3a. apply filtered patch to clean repo (clean)
if backups:
hg.revert(repo, basenode, backups.has_key)
- # Reapply permissions back to clean files
- for realname, tmpname in backups.iteritems():
- shutil.copymode(tmpname, repo.wjoin(realname))
# 3b. apply filtered patch to clean repo (apply)
if dopatch:
@@ -520,7 +517,9 @@ try:
try:
fp.seek(0)
- internalpatch(fp, ui, 1, repo.root)
+ pfiles = {}
+ internalpatch(fp, ui, 1, repo.root, files=pfiles)
+ patch.updatedir(ui, repo, pfiles)
patchdone = 1
except:
if opts['force']:
|
Loading...