##// END OF EJS Templates
merge: remove redundant unlink after merge...
Mads Kiilerich -
r18331:e68cec5e default
parent child Browse files
Show More
@@ -402,11 +402,6 b' def applyupdates(repo, actions, wctx, mc'
402 402 updated += 1
403 403 else:
404 404 merged += 1
405 if (move and repo.dirstate.normalize(fd) != f
406 and os.path.lexists(repo.wjoin(f))):
407 repo.ui.debug("removing %s\n" % f)
408 audit(f)
409 os.unlink(repo.wjoin(f))
410 405 elif m == "g": # get
411 406 flags = a[2]
412 407 repo.ui.note(_("getting %s\n") % f)
General Comments 0
You need to be logged in to leave comments. Login now