Mercurial > hg
changeset 5704:5049bbf988e1
merge: use util.set_flags
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 27 Dec 2007 22:27:48 -0600 |
parents | 14789f30ac11 |
children | 4e400863c5ac |
files | mercurial/merge.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Dec 27 22:27:47 2007 -0600 +++ b/mercurial/merge.py Thu Dec 27 22:27:48 2007 -0600 @@ -510,7 +510,7 @@ updated += 1 else: merged += 1 - util.set_exec(repo.wjoin(fd), "x" in flags) + util.set_flags(repo.wjoin(fd), flags) if f != fd and move and util.lexists(repo.wjoin(f)): repo.ui.debug(_("removing %s\n") % f) os.unlink(repo.wjoin(f)) @@ -539,7 +539,7 @@ repo.ui.warn(" %s\n" % nf) elif m == "e": # exec flags = a[2] - util.set_exec(repo.wjoin(f), flags) + util.set_flags(repo.wjoin(f), flags) return updated, merged, removed, unresolved