##// END OF EJS Templates
merge: audit the right destination file when merging with dir rename
Mads Kiilerich -
r20615:b96cb15e 2.9.1 stable
parent child Browse files
Show More
@@ -654,7 +654,7 b' def applyupdates(repo, actions, wctx, mc'
654 f2, fd, flags = args
654 f2, fd, flags = args
655 if f:
655 if f:
656 repo.ui.note(_("moving %s to %s\n") % (f, fd))
656 repo.ui.note(_("moving %s to %s\n") % (f, fd))
657 audit(f)
657 audit(fd)
658 repo.wwrite(fd, wctx.filectx(f).data(), flags)
658 repo.wwrite(fd, wctx.filectx(f).data(), flags)
659 util.unlinkpath(repo.wjoin(f))
659 util.unlinkpath(repo.wjoin(f))
660 if f2:
660 if f2:
General Comments 0
You need to be logged in to leave comments. Login now